Replace assume() with munit TestTransform that skips tests at discovery

Author: trly

.github/workflows/ci.yml

@@ -5,43 +5,16 @@ on:
       - main
   pull_request:
 jobs:
-  gradle_8:
+  test:
     runs-on: ${{ matrix.os }}
-    name: Tests (Gradle 8)
+    name: Tests (JDK ${{ matrix.java }})
     strategy:
       fail-fast: false
       matrix:
         # NOTE(olafurpg) Windows is not enabled because it times out due to reasons I don't understand.
         # os: [windows-latest, ubuntu-latest]
         os: [ubuntu-latest]
-        java: [8, 11, 17, 21]
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-java@v5
-        with:
-          distribution: "temurin"
-          cache: "sbt"
-          java-version: ${{ matrix.java }}
-
-      - uses: sbt/setup-sbt@v1
-
-      - name: Setup Gradle 8.14.3
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          gradle-version: "8.14.3"
-
-      - name: Main project tests
-        run: sbt test
-
-  gradle_9:
-    runs-on: ${{ matrix.os }}
-    name: Tests (Gradle 9)
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        java: [17, 21, 25]
+        java: [8, 11, 17, 21, 25]
     steps:
       - uses: actions/checkout@v6
 
@@ -53,11 +26,6 @@ jobs:
 
       - uses: sbt/setup-sbt@v1
 
-      - name: Setup Gradle 9.2.1
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          gradle-version: "9.2.1"
-
       - name: Main project tests
         run: sbt test
 

tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala

@@ -19,6 +19,7 @@ import munit.TestOptions
 import os.Shellable
 
 object Java8Only extends munit.Tag("Java8Only")
+case class JVMCompatibility(tools: List[Tool]) extends munit.Tag("JVMCompatibility")
 
 abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
   self =>
@@ -44,6 +45,22 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
               t.tag(munit.Ignore)
             else
               t
+        ),
+        new TestTransform(
+          "JVMCompatibility",
+          t =>
+            t.tags
+              .collectFirst { case JVMCompatibility(tools) => tools }
+              .map { tools =>
+                val minJDK = Tool.minimumSupportedJdk(tools)
+                val maxJDK = Tool.maximumSupportedJdk(tools).getOrElse(Int.MaxValue)
+                val javaVersion = BaseBuildToolSuite.externalJavaVersion
+                if (javaVersion < minJDK || javaVersion > maxJDK)
+                  t.tag(munit.Ignore)
+                else
+                  t
+              }
+              .getOrElse(t)
         )
       )
 
@@ -79,28 +96,13 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
       targetRoot: Option[String] = None,
       tools: List[Tool] = Nil
   ): Unit = {
-    val minJDK = Tool.minimumSupportedJdk(tools)
-    val maxJDK = Tool.maximumSupportedJdk(tools).getOrElse(Int.MaxValue)
-    val externalJDKVersion = BaseBuildToolSuite.externalJavaVersion
-
-    val JDKSupported =
-      externalJDKVersion >= minJDK && externalJDKVersion <= maxJDK
-
-    val ignoreMsg =
-      s"Test ${options
-          .name} was ignored because the external JDK version doesn't match the toolset requirements: " +
-        s"Tools: $tools, min JDK = $minJDK, max JDK = $maxJDK, detected JDK = $externalJDKVersion"
-
-    test(options.withTags(options.tags ++ tags)) {
-      // Unfortunately, MUnit doesn't seem to handle the ignore messages the
-      // way we'd want: https://github.com/scalameta/munit/issues/549#issuecomment-2056751821
-      // So instead, to give some indication that the test was actually ignored,
-      // we print this message
-      if (!JDKSupported)
-        System.err.println(ignoreMsg)
-
-      assume(JDKSupported, ignoreMsg)
+    val testTags =
+      if (tools.nonEmpty)
+        options.tags ++ tags + JVMCompatibility(tools)
+      else
+        options.tags ++ tags
 
+    test(options.withTags(testTags)) {
       if (initCommand.nonEmpty) {
         os.proc(Shellable(initCommand)).call(os.Path(workingDirectory))
       }