CI: fix emulated jobs + fix FreeBSD job (#699)

* Bump uraimo/run-on-arch-action to 2.8.2 * Switch FreeBSD job to use ghcup
haskell · Dec 5, 2024 · 8415e30 · 8415e30
1 parent a2b6d05
commit 8415e30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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:

diff --git 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 }}