Merge pull request #707 from armanbilge/fix/macos-latest-is-14

macos-latest is now macos-14
typelevel · May 6, 2024 · 8297740 · 8297740
2 parents 9371b95 + e8d7460
commit 8297740
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,11 +41,7 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - macos-14
-          - windows-latest
+        os: [ubuntu-latest, macos-latest, windows-latest]
         scala: [2.12]
         java:
           - temurin@8
@@ -59,40 +55,28 @@ jobs:
         exclude:
           - java: temurin@11
             os: macos-latest
-          - java: temurin@11
-            os: macos-14
           - java: temurin@11
             os: windows-latest
-          - java: temurin@17
-            os: macos-latest
           - java: temurin@17
             os: windows-latest
           - java: graal_22.3.2@11
             os: macos-latest
-          - java: graal_22.3.2@11
-            os: macos-14
           - java: graal_22.3.2@11
             os: windows-latest
           - java: graalvm@17
             os: macos-latest
-          - java: graalvm@17
-            os: macos-14
           - java: graalvm@17
             os: windows-latest
           - java: corretto@17
             os: macos-latest
-          - java: corretto@17
-            os: macos-14
           - java: corretto@17
             os: windows-latest
           - java: semeru@17
             os: macos-latest
-          - java: semeru@17
-            os: macos-14
           - java: semeru@17
             os: windows-latest
           - java: temurin@8
-            os: macos-14
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:

diff --git a/.mergify.yml b/.mergify.yml
@@ -19,8 +19,7 @@ pull_request_rules:
   - status-success=Build and Test (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM)
-  - status-success=Build and Test (macos-latest, 2.12, temurin@8, sbt-typelevelJVM)
-  - status-success=Build and Test (macos-14, 2.12, temurin@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)
   - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
   - status-success=Validate Steward Config (ubuntu-latest, temurin@11)
   - status-success=Generate Site (ubuntu-latest, temurin@11)

diff --git a/build.sbt b/build.sbt
@@ -24,18 +24,18 @@ ThisBuild / githubWorkflowJavaVersions ++= Seq(
   JavaSpec.semeru("17")
 )
 
-val macos14 = "macos-14"
+val macOS = "macos-latest"
 
-ThisBuild / githubWorkflowOSes ++= Seq("macos-latest", macos14, "windows-latest")
+ThisBuild / githubWorkflowOSes ++= Seq(macOS, "windows-latest")
 
 ThisBuild / githubWorkflowBuildMatrixExclusions ++= {
   val exclusions = for {
     java <- githubWorkflowJavaVersions.value.tail
     os <- githubWorkflowOSes.value.tail
-    if !(java == temurin17 && os == macos14) // keep this one
+    if !(java == temurin17 && os == macOS) // keep this one
   } yield MatrixExclude(Map("java" -> java.render, "os" -> os))
 
-  exclusions :+ MatrixExclude(Map("java" -> temurin8.render, "os" -> macos14))
+  exclusions :+ MatrixExclude(Map("java" -> temurin8.render, "os" -> macOS))
 }
 
 ThisBuild / githubWorkflowPublishTimeoutMinutes := Some(45)