Merge pull request #6828 from commercialhaskell/ci-macos-x86_64

mpilgrem · web-flow · commit 33d6b9ad71ea · 2025-12-19T21:23:20.000Z
Move macOS/x86_64 CI to macos-15-intel
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -16,8 +16,8 @@ on:
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-# As of 2025-11-05, ubuntu-latest and windows-latest come with Stack 3.7.1
-# and GHC 9.12.2. However, macos-13 and macos-latest do not come with Haskell
+# As of 2025-11-05, ubuntu-latest and windows-latest come with Stack 3.7.1 and
+# GHC 9.12.2. However, macos-15-intel and macos-latest do not come with Haskell
 # tools. windows-latest no longer comes with NSIS 3.10, for which the default
 # value of the 'Unicode' installer attribute is 'true'. However, that is not the
 # 'large strings' build of NSIS and creates installers that corrupt the PATH
@@ -48,9 +48,10 @@ jobs:
         - os: windows-latest
           release-args: ""
           cache-bust: "2025-11-05"
-        - os: macos-13
+        # macos-15-intel will be the last that provides macOS/x86_64
+        - os: macos-15-intel
           release-args: ""
-          cache-bust: "2024-11-05"
+          cache-bust: "2025-12-19"
         # macos-latest provides macOS/AArch64 (M1)
         - os: macos-latest
           release-args: ""
@@ -96,10 +97,10 @@ jobs:
       run: |
         set -ex
 
-        if [[ "${{ matrix.os }}" == "ubuntu-24.04-arm" || "${{ matrix.os }}" == "macos-13" || "${{ matrix.os }}" == "macos-latest" ]]
+        if [[ "${{ matrix.os }}" == "ubuntu-24.04-arm" || "${{ matrix.os }}" == "macos-15-intel" || "${{ matrix.os }}" == "macos-latest" ]]
         then
-          # ubuntu-24.04-arm, macos-13 and macos-latest do not include Haskell
-          # tools as at 2025-11-05.
+          # ubuntu-24.04-arm, macos-15-intel and macos-latest do not include
+          # Haskell tools as at 2025-12-19.
           curl -sSL https://get.haskellstack.org/ | sh
         fi
 
