From 19727c9707fd5035b6c065387187d83fe6e51164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CB=8Cbod=CA=B2=C9=AA=CB=88=C9=A1r=CA=B2im?= Date: Mon, 28 Oct 2024 20:54:44 +0000 Subject: [PATCH] CI: fix NetBSD job + fix aarch64 job (#700) * Another attempt to fix NetBSD CI job * Fix aarch64 job --- .cirrus.yml | 10 ++++------ .github/workflows/ci.yml | 2 +- 2 files changed, 5 insertions(+), 7 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/" 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