From dad32bf382282a52465166c67a635257892d3e69 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Tue, 22 Oct 2024 22:05:14 +0100 Subject: [PATCH 1/2] Bump uraimo/run-on-arch-action to 2.8.2 --- .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 45d44cf2..c8736c07 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.7.2 + - uses: uraimo/run-on-arch-action@v2.8.1 timeout-minutes: 60 with: arch: ${{ matrix.arch }} From 7dd564a29479b0a6deb459bf0ad10f68bdfb1bef Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Tue, 22 Oct 2024 22:06:40 +0100 Subject: [PATCH 2/2] Switch FreeBSD job to use ghcup --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index aafd8a43..2b21a0c3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,9 +2,11 @@ task: name: FreeBSD freebsd_instance: image_family: freebsd-14-0 - install_script: pkg install -y ghc hs-cabal-install git + 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 script: - - cabal update + - export PATH="$HOME/.ghcup/bin:$PATH" - cabal test --test-show-details=direct task: