Merge pull request #6560 from commercialhaskell/ci-macOS

commercialhaskell · Apr 26, 2024 · 90fd222 · 90fd222
2 parents 4945928 + 637aeea
commit 90fd222
Show file tree

Hide file tree

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