From 43c5cd51310246f91b3ffab8237306a605e812f9 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sat, 26 Oct 2024 22:07:27 +0100 Subject: [PATCH 1/2] Another attempt to fix NetBSD CI job --- .cirrus.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2b21a0c3..b14aa822 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,9 +13,8 @@ task: name: OpenBSD compute_engine_instance: image_project: pg-ci-images - # OpenBSD version should match - # https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl - image: family/pg-ci-openbsd-vanilla-7-3 + # See https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl + image: family/pg-ci-openbsd-vanilla platform: openbsd install_script: pkg_add ghc cabal-install git script: @@ -27,9 +26,8 @@ task: name: NetBSD compute_engine_instance: image_project: pg-ci-images - # NetBSD version should match - # https://github.com/anarazel/pg-vm-images/blob/main/packer/netbsd.pkrvars.hcl - image: family/pg-ci-netbsd-vanilla-9-3 + # See https://github.com/anarazel/pg-vm-images/blob/main/packer/netbsd.pkrvars.hcl + image: family/pg-ci-netbsd-vanilla platform: netbsd install_script: - export PKG_PATH="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f '1 2' -d.)/All/" From 7e065313634880814442bc5cd2fae610203120b7 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sat, 26 Oct 2024 22:19:33 +0100 Subject: [PATCH 2/2] Fix aarch64 job --- .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 c8736c07..19786174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -230,7 +230,7 @@ jobs: uses: docker://hasufell/arm64v8-ubuntu-haskell:focal name: Run build (arm64v8 linux) with: - args: sh -c "cabal update && cabal test" + args: sh -c "ghcup install ghc 9.10.1 && cabal update && cabal test -w ~/.ghcup/bin/ghc-9.10.1" wasi: runs-on: ubuntu-latest