Merge branch '1.10.x' into wip/fix-string-logging

eed3si9n · May 5, 2024 · 26cdfa8 · 26cdfa8
2 parents da79479 + 1c7c621
commit 26cdfa8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,8 +41,8 @@ jobs:
             distribution: adopt
             jobtype: 7
           - os: macos-latest
-            java: 8
-            distribution: adopt
+            java: 17
+            distribution: temurin
             jobtype: 8
           - os: windows-latest
             java: 8
@@ -86,10 +86,10 @@ jobs:
       with:
         distribution: "${{ matrix.distribution }}"
         java-version: "${{ matrix.java }}"
-    - name: Set up Python 3.7
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.12
     - name: Coursier cache
       uses: coursier/cache-action@v6
     - name: Cache sbt
@@ -173,13 +173,13 @@ jobs:
       shell: bash
       run: |
         # test building sbtn on macOS
-        sbt "-Dsbt.io.virtual=false" nativeImage
+        ./sbt "-Dsbt.io.virtual=false" nativeImage
         # test launcher script
-        echo build using JDK 8, test using JDK 8, on macOS
         cd launcher-package
         bin/coursier resolve
-        sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test
-        cd citest && ./test.sh
+        ../sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test
+        # This fails due to the JLine issue
+        # cd citest && ./test.sh
     - name: Build and test (9)
       if: ${{ matrix.jobtype == 9 }}
       shell: bash

diff --git a/launcher-package/integration-test/src/test/scala/RunnerTest.scala b/launcher-package/integration-test/src/test/scala/RunnerTest.scala
@@ -3,12 +3,14 @@ package example.test
 import minitest._
 import scala.sys.process._
 import java.io.File
+import java.util.Locale
 
 object SbtRunnerTest extends SimpleTestSuite with PowerAssertions {
   // 1.3.0, 1.3.0-M4
   private[test] val versionRegEx = "\\d(\\.\\d+){2}(-\\w+)?"
 
-  lazy val isWindows: Boolean = sys.props("os.name").toLowerCase(java.util.Locale.ENGLISH).contains("windows")
+  lazy val isWindows: Boolean = sys.props("os.name").toLowerCase(Locale.ENGLISH).contains("windows")
+  lazy val isMac: Boolean = sys.props("os.name").toLowerCase(Locale.ENGLISH).contains("mac")
   lazy val sbtScript =
     if (isWindows) new File("target/universal/stage/bin/sbt.bat")
     else new File("target/universal/stage/bin/sbt")
@@ -58,9 +60,12 @@ object SbtRunnerTest extends SimpleTestSuite with PowerAssertions {
   }
 
   test("sbt \"testOnly *\"") {
-    val out = sbtProcess("testOnly *", "--no-colors", "-v").!!.linesIterator.toList
-    assert(out.contains[String]("[info] HelloTest"))
-    ()
+    if (isMac) ()
+    else {
+      val out = sbtProcess("testOnly *", "--no-colors", "-v").!!.linesIterator.toList
+      assert(out.contains[String]("[info] HelloTest"))
+      ()
+    }
   }
 
   /*