Tweak exclusions

typelevel · Feb 22, 2024 · ff65f4d · ff65f4d
1 parent b63356e
commit ff65f4d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,40 +59,26 @@ 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: macos-14
-          - 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
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:

diff --git a/.mergify.yml b/.mergify.yml
@@ -20,8 +20,15 @@ pull_request_rules:
   - 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@8, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-14, 2.12, temurin@11, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-14, 2.12, temurin@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-14, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-14, 2.12, graalvm@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-14, 2.12, corretto@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-14, 2.12, semeru@17, sbt-typelevelJVM)
   - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
+  - status-success=Build and Test (windows-latest, 2.12, temurin@17, sbt-typelevelJVM)
   - status-success=Validate Steward Config (ubuntu-latest, temurin@11)
   - status-success=Generate Site (ubuntu-latest, temurin@11)
   - '#approved-reviews-by>=1'

diff --git a/build.sbt b/build.sbt
@@ -12,22 +12,30 @@ ThisBuild / developers ++= List(
 )
 ThisBuild / startYear := Some(2022)
 
+val temurin8 = JavaSpec.temurin("8")
+val temurin17 = JavaSpec.temurin("17")
+
 ThisBuild / githubWorkflowJavaVersions ++= Seq(
   JavaSpec.temurin("11"),
-  JavaSpec.temurin("17"),
+  temurin17,
   JavaSpec(JavaSpec.Distribution.GraalVM("22.3.2"), "11"),
   JavaSpec.graalvm("17"),
   JavaSpec.corretto("17"),
   JavaSpec.semeru("17")
 )
 
-ThisBuild / githubWorkflowOSes ++= Seq("macos-latest", "macos-14", "windows-latest")
+val macos14 = "macos-14"
+
+ThisBuild / githubWorkflowOSes ++= Seq("macos-latest", macos14, "windows-latest")
 
 ThisBuild / githubWorkflowBuildMatrixExclusions ++= {
-  for {
+  val exclusions = for {
     java <- githubWorkflowJavaVersions.value.tail
     os <- githubWorkflowOSes.value.tail
+    if java != temurin17 && os != macos14 // keep this one
   } yield MatrixExclude(Map("java" -> java.render, "os" -> os))
+
+  exclusions :+ MatrixExclude(Map("java" -> temurin8.render, "os" -> macos14))
 }
 
 ThisBuild / githubWorkflowPublishTimeoutMinutes := Some(45)