Merge pull request #3872 from Gedochao/maintenance/jvm-bootstrapped-tests

Run the default (Scala 3 Next) suite with the JVM bootstrapped launcher on the CI

Author: Gedochao

.github/workflows/ci.yml

@@ -73,6 +73,31 @@ jobs:
       run: |
         fish -c './mill __.compile'
 
+  jvm-bootstrapped-tests:
+    timeout-minutes: 120
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: VirtusLab/scala-cli-setup@v1
+        with:
+          jvm: "temurin:17"
+      - name: JVM integration tests
+        run: ./mill -i integration.test.jvmBootstrapped
+        env:
+          SCALA_CLI_IT_GROUP: 1
+      - name: Convert Mill test reports to JUnit XML format
+        if: success() || failure()
+        run: .github/scripts/generate-junit-reports.sc jvm-bootstrapped-tests 'Scala CLI JVM Bootstrapped Tests' test-report.xml out/
+      - name: Upload test report
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: test-results-jvm-bootstrapped-tests
+          path: test-report.xml
+
   jvm-tests-1:
     timeout-minutes: 120
     runs-on: ubuntu-24.04
@@ -88,9 +113,6 @@ jobs:
       run: ./mill -i integration.test.jvm
       env:
         SCALA_CLI_IT_GROUP: 1
-    - name: Fat jar integration test
-      if: success() || failure()
-      run: ./mill integration.test.jvmBootstrapped 'scala.cli.integration.StandaloneLauncherTests.*'
     - name: Convert Mill test reports to JUnit XML format
       if: success() || failure()
       run: .github/scripts/generate-junit-reports.sc jvm-tests-1 'Scala CLI JVM Tests (1)' test-report.xml out/
@@ -1615,6 +1637,7 @@ jobs:
   publish:
     needs:
       - unit-tests
+      - jvm-bootstrapped-tests
       - jvm-tests-1
       - jvm-tests-2
       - jvm-tests-3
@@ -1702,6 +1725,7 @@ jobs:
     timeout-minutes: 20
     needs:
       - unit-tests
+      - jvm-bootstrapped-tests
       - jvm-tests-1
       - jvm-tests-2
       - jvm-tests-3

modules/integration/src/test/scala/scala/cli/integration/CoursierScalaInstallationTestHelper.scala

@@ -60,12 +60,9 @@ trait CoursierScalaInstallationTestHelper {
         val scalaScript = execLine match { case scriptPathRegex(extractedPath) => extractedPath }
         val scalaScriptPath = os.Path(scalaScript)
         val lineToChange    = "eval \"${SCALA_CLI_CMD_BASH[@]}\" \\"
-        // FIXME: the way the scala script calls the launcher currently ignores the --debug flag
-        val newContent = os.read(scalaScriptPath).replace(
-          lineToChange,
-          s"""SCALA_CLI_CMD_BASH=(\"\\\"${TestUtil.cliPath}\\\"\")
-             |$lineToChange""".stripMargin
-        )
+        val changedLine     =
+          s"""eval \"${TestUtil.cli.mkString(s"\" \\${System.lineSeparator()}")}\" \\"""
+        val newContent = os.read(scalaScriptPath).replace(lineToChange, changedLine)
         os.write.over(scalaScriptPath, newContent)
         scalaBinary -> scalaScriptPath
       }