Merge branch 'ci' into fix-ci2

runeksvendsen · Jan 2, 2025 · 5a45a51 · 5a45a51
2 parents a42fb0e + 7f028c3
commit 5a45a51
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/.github/workflows/cabal-in-nix-shell.yml b/.github/workflows/cabal-in-nix-shell.yml
@@ -9,11 +9,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, macos-13]
+        os: [ubuntu-22.04, ubuntu-20.04, macos-13, macos-14]
         ghc: [ghc7103, ghc802, ghc822, ghc844, ghc865Binary, ghc884, ghc810, ghc90, ghc92, ghc94, ghc96]
-        cc: [gcc8, gcc10, gcc12, gcc14, clang_12, clang_16, clang_18]
+        cc: [gcc8, gcc12, gcc14, clang_12, clang_16, clang_18]
         exclude:
-          # GHC version >= 7.10 and <= 8.4 are provided by a version of nixpkgs that is broken for macos-13 (cf. https://github.com/NixOS/nixpkgs/issues/104580)
+          # GHC version >= 7.10 and <= 8.4 are provided by a version of nixpkgs that is broken for macOS (cf. https://github.com/NixOS/nixpkgs/issues/104580)
           - os: macos-13
             ghc: ghc7103
           - os: macos-13
@@ -22,6 +22,14 @@ jobs:
             ghc: ghc822
           - os: macos-13
             ghc: ghc844
+          - os: macos-14
+            ghc: ghc7103
+          - os: macos-14
+            ghc: ghc802
+          - os: macos-14
+            ghc: ghc822
+          - os: macos-14
+            ghc: ghc844
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -35,6 +43,7 @@ jobs:
             substituters = https://cache.nixos.org https://cache.iog.io
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
             system-features = benchmark big-parallel kvm nixos-test
+            ${{ startsWith(matrix.os, 'macos') && 'system = x86_64-darwin' || '' }}
 
       - name: Cache cabal files
         uses: actions/cache@v3