From d1265dc8babe42f686c4dd6c0eaf76dd3c823e49 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Thu, 25 Apr 2024 23:52:22 +0100 Subject: [PATCH] Bump CI for macos-14 becoming macos-latest --- .github/workflows/integration-tests.yml | 10 +++++----- .github/workflows/unit-tests.yml | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5757698f13..eb6c8c473a 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -37,11 +37,11 @@ jobs: - os: windows-latest release-args: "" cache-bust: "2024-01-20" - - os: macos-latest + - os: macos-12 release-args: "" cache-bust: "2024-01-20" - # macos-14 provides macOS/AArch64 (M1) - - os: macos-14 + # macos-latest provides macOS/AArch64 (M1) + - os: macos-latest release-args: "" cache-bust: "2024-02-02" steps: @@ -67,9 +67,9 @@ jobs: run: | set -ex - if [[ "${{ matrix.os }}" == "macos-14" ]] + if [[ "${{ matrix.os }}" == "macos-latest" ]] then - # macos-14 does not include Haskell tools as at 2024-02-02. + # macos-latest does not include Haskell tools as at 2024-04-25. curl -sSL https://get.haskellstack.org/ | sh fi diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ad768290fa..ec4df102fc 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -74,6 +74,12 @@ jobs: run: | set -ex + if [[ "${{ matrix.os }}" == "macos-latest" ]] + then + # macos-latest does not include Haskell tools as at 2024-04-25. + curl -sSL https://get.haskellstack.org/ | sh + fi + if [[ "${{ matrix.extra-suffix }}" == "alpine" ]] then mkdir -p ~/.stack