From 409b4fcea671364d54471e0f4b7101f40c3b7e92 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sat, 7 Sep 2024 13:52:58 +0100 Subject: [PATCH] Do not submit --- .github/workflows/ci.yml | 15 ++++++--------- cabal.project.wasi | 6 +----- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d400a9361..862166983 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,15 +119,14 @@ jobs: # striking out `cabal test`. Instead we rely on system packages and invoke # `ghc --make` manually, and even so `ghc -O` is prohibitively expensive. emulated: - needs: build runs-on: ubuntu-latest strategy: fail-fast: true matrix: - arch: ['s390x', 'ppc64le'] + arch: ['s390x', 'ppc64le', 'riscv64'] steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.5.0 + - uses: uraimo/run-on-arch-action@v2.7.2 timeout-minutes: 60 with: arch: ${{ matrix.arch }} @@ -135,11 +134,10 @@ jobs: githubToken: ${{ github.token }} install: | apt-get update -y - apt-get install -y curl ghc libghc-tasty-quickcheck-dev libghc-syb-dev + apt-get install -y ghc libghc-tasty-quickcheck-dev libghc-syb-dev run: | - curl -s https://hackage.haskell.org/package/data-array-byte-0.1/data-array-byte-0.1.tar.gz | tar xz ghc --version - ghc --make -XHaskell2010 -XBangPatterns -XDeriveDataTypeable -XDeriveGeneric -XDeriveLift -XFlexibleContexts -XFlexibleInstances -XLambdaCase -XMagicHash -XMultiWayIf -XNamedFieldPuns -XPatternSynonyms -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XUnboxedTuples -optP-Wall -optP-Werror=undef -DPURE_HASKELL=0 -Iinclude -itests:tests/builder:data-array-byte-0.1 -o Main cbits/*.c tests/Main.hs +RTS -s + ghc --make -XHaskell2010 -XBangPatterns -XDeriveDataTypeable -XDeriveGeneric -XDeriveLift -XFlexibleContexts -XFlexibleInstances -XLambdaCase -XMagicHash -XMultiWayIf -XNamedFieldPuns -XPatternSynonyms -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XUnboxedTuples -optP-Wall -optP-Werror=undef -DPURE_HASKELL=0 -Iinclude -itests:tests/builder -o Main cbits/*.c tests/Main.hs +RTS -s ./Main +RTS -s bounds-checking: @@ -235,12 +233,11 @@ jobs: wasi: runs-on: ubuntu-latest - needs: build env: - GHC_WASM_META_REV: c0aa3bb7d88bb6ec809210e17658dd1ed64ba66c + GHC_WASM_META_REV: a04cc1a2206d2030326e1d49be9c6a94ee4283a3 strategy: matrix: - ghc: ['9.6', '9.8'] + ghc: ['9.10'] fail-fast: false steps: - name: setup-ghc-wasm32-wasi diff --git a/cabal.project.wasi b/cabal.project.wasi index f8eeeab62..1ce82edb0 100644 --- a/cabal.project.wasi +++ b/cabal.project.wasi @@ -2,8 +2,4 @@ source-repository-package type: git location: https://github.com/amesgen/splitmix - tag: 83b906c4bcdc2720546f1779a16eb65e8e12ecba - -package splitmix - tests: False - benchmarks: False + tag: 5f5b766d97dc735ac228215d240a3bb90bc2ff75