From 37ac7fe4ffba1e30ceaf98a870c244f4ab9cbf01 Mon Sep 17 00:00:00 2001
From: Arman Bilge <armanbilge@gmail.com>
Date: Thu, 22 Feb 2024 04:31:29 +0000
Subject: [PATCH] Fix excludes

---
 .github/workflows/ci.yml | 14 ++++++++++++++
 .mergify.yml             |  7 -------
 build.sbt                |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4e49a851..971bf787 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,21 +60,35 @@ jobs:
           - 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
diff --git a/.mergify.yml b/.mergify.yml
index 1ef76a10..6bba5ca4 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -20,15 +20,8 @@ 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-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
index de312c23..39a7570f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -32,7 +32,7 @@ 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 == macos14) // keep this one
   } yield MatrixExclude(Map("java" -> java.render, "os" -> os))
 
   exclusions :+ MatrixExclude(Map("java" -> temurin8.render, "os" -> macos14))