Merge pull request #2356 from tweag/cb/ci-macos-14

CI: Update macos image to macos-14

Author: avdv

.github/workflows/patch-test.yaml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-13, windows-2022]
+        os: [ubuntu-24.04, macos-14, windows-2022]
         ghc-version: ${{ fromJSON(needs.find-ghc-version.outputs.ghc-matrix) }}
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/workflow.yaml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-13]
+        os: [ubuntu-24.04, macos-14]
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-13, windows-2022]
+        os: [ubuntu-24.04, macos-14, windows-2022]
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
@@ -254,7 +254,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-13, macos-14, windows-2022]
+        os: [ubuntu-24.04, macos-14, macos-15-intel, windows-2022]
         bzlmod: [true, false]
         bazel:
           - "6.x"

rules_haskell_tests/tests/recompilation/recompilation_workspace/WORKSPACE

@@ -13,9 +13,9 @@ rules_haskell_dependencies()
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
 haskell_register_ghc_nixpkgs(
-    attribute_path = "haskell.compiler.ghc8107",
+    attribute_path = "haskell.compiler.ghc948",
     repository = "@rules_haskell//nixpkgs:default.nix",
-    version = "8.10.7",
+    version = "9.4.8",
 )
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
@@ -24,7 +24,7 @@ rules_haskell_toolchains(
     dist = {
         "linux_amd64": "deb10",
     },
-    version = "8.10.7",
+    version = "9.4.8",
 )
 
 load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_cc_configure")

rules_haskell_tests/tests/test_haddock.bzl

@@ -95,15 +95,15 @@ def expected_values(test_ghc_version):
         ]
     elif test_ghc_version == "9.8.2" and is_darwin:
         return [
-            "haddock/array-0.5.6.0-28ee",
-            "haddock/base-4.19.1.0-654f",
-            "haddock/deepseq-1.5.0.0-778c",
-            "haddock/ghc-bignum-1.3-8434",
-            "haddock/ghc-boot-th-9.8.2-bc62",
-            "haddock/ghc-prim-0.11.0-a7d8",
+            "haddock/array-0.5.6.0-a13d",
+            "haddock/base-4.19.1.0-e86d",
+            "haddock/deepseq-1.5.0.0-8f97",
+            "haddock/ghc-bignum-1.3-625d",
+            "haddock/ghc-boot-th-9.8.2-c69e",
+            "haddock/ghc-prim-0.11.0-f42f",
             "haddock/index",
-            "haddock/pretty-1.1.3.6-ffc0",
-            "haddock/template-haskell-2.21.0.0-fc14",
+            "haddock/pretty-1.1.3.6-b285",
+            "haddock/template-haskell-2.21.0.0-4c6f",
             "haddock/testsZShaddockZShaddock-lib-a",
             "haddock/testsZShaddockZShaddock-lib-b",
             "haddock/testsZShaddockZShaddock-lib-deep",