Merge pull request #3988 from djspiewak/build/m-series-runners

Updated macos GHA runners to use the new M series
typelevel · Feb 26, 2024 · dea662d · dea662d
2 parents cdb3fe6 + 495c520
commit dea662d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-14]
         scala: [3.3.1, 2.12.18, 2.13.12]
         java:
           - temurin@8
@@ -52,15 +52,17 @@ jobs:
           - os: windows-latest
             scala: 3.3.1
             ci: ciJVM
-          - os: macos-latest
+          - os: macos-14
             scala: 3.3.1
             ci: ciJVM
           - os: windows-latest
             scala: 2.12.18
             ci: ciJVM
-          - os: macos-latest
+          - os: macos-14
             scala: 2.12.18
             ci: ciJVM
+          - os: macos-14
+            java: temurin@8
           - ci: ciFirefox
             scala: 3.3.1
           - ci: ciChrome
@@ -79,7 +81,7 @@ jobs:
             java: graalvm@17
           - os: windows-latest
             ci: ciJS
-          - os: macos-latest
+          - os: macos-14
             ci: ciJS
           - ci: ciFirefox
             java: temurin@11
@@ -91,7 +93,7 @@ jobs:
             java: graalvm@17
           - os: windows-latest
             ci: ciFirefox
-          - os: macos-latest
+          - os: macos-14
             ci: ciFirefox
           - ci: ciChrome
             java: temurin@11
@@ -103,7 +105,7 @@ jobs:
             java: graalvm@17
           - os: windows-latest
             ci: ciChrome
-          - os: macos-latest
+          - os: macos-14
             ci: ciChrome
           - ci: ciNative
             java: temurin@11
@@ -115,7 +117,7 @@ jobs:
             java: graalvm@17
           - os: windows-latest
             ci: ciNative
-          - os: macos-latest
+          - os: macos-14
             ci: ciNative
             scala: 2.12.18
           - os: windows-latest

diff --git a/build.sbt b/build.sbt
@@ -110,7 +110,7 @@ ThisBuild / developers := List(
 
 val PrimaryOS = "ubuntu-latest"
 val Windows = "windows-latest"
-val MacOS = "macos-latest"
+val MacOS = "macos-14"
 
 val Scala212 = "2.12.18"
 val Scala213 = "2.13.12"
@@ -244,7 +244,7 @@ ThisBuild / githubWorkflowBuildMatrixExclusions := {
       Seq(
         MatrixExclude(Map("os" -> Windows, "scala" -> scala, "ci" -> CI.JVM.command)),
         MatrixExclude(Map("os" -> MacOS, "scala" -> scala, "ci" -> CI.JVM.command)))
-    }
+    } :+ MatrixExclude(Map("os" -> MacOS, "java" -> OldGuardJava.render))
 
   val jsScalaFilters = for {
     scala <- (ThisBuild / githubWorkflowScalaVersions).value.filterNot(Set(Scala213))