From 879f9b5ece12e214fcb5750e958b7b561f25614c Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 9 Jun 2025 20:37:10 +0100 Subject: [PATCH 1/3] Remove cabal.project.wasi, it's no longer needed with splitmix-0.1.2 --- .github/workflows/ci.yml | 1 - cabal.project.wasi | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 cabal.project.wasi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b42a8a6..061dc74c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -260,7 +260,6 @@ jobs: wasi-${{ runner.os }}-${{ env.GHC_WASM_META_REV }}-flavour-${{ matrix.ghc }}- - name: Build run: | - mv cabal.project.wasi cabal.project.local wasm32-wasi-cabal build --enable-tests wasm32-wasi-cabal list-bin test:bytestring-tests - name: Test diff --git a/cabal.project.wasi b/cabal.project.wasi deleted file mode 100644 index 1ce82edb..00000000 --- a/cabal.project.wasi +++ /dev/null @@ -1,5 +0,0 @@ --- https://github.com/haskellari/splitmix/pull/73 -source-repository-package - type: git - location: https://github.com/amesgen/splitmix - tag: 5f5b766d97dc735ac228215d240a3bb90bc2ff75 From 746d339e5be5acffb870d59060553c3e7bc1dec0 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 9 Jun 2025 20:43:40 +0100 Subject: [PATCH 2/3] CI: bump FreeBSD version --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index b14aa822..8961f55f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ task: name: FreeBSD freebsd_instance: - image_family: freebsd-14-0 + image_family: freebsd-14-2 install_script: - pkg install -y git gmake - curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh From 8c1c93c2326bd8b6a764d2c31f7713c724f82b55 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 9 Jun 2025 20:53:17 +0100 Subject: [PATCH 3/3] CI: fix emulated workflows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 061dc74c..6a4651ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: arch: ['s390x', 'ppc64le', 'riscv64'] steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.8.1 + - uses: uraimo/run-on-arch-action@v3 timeout-minutes: 60 with: arch: ${{ matrix.arch }}