Merge pull request #210 from sbt/wip/cross2

Fix cross test
sbt · Nov 3, 2024 · c16dda8 · c16dda8
2 parents 0852227 + 4f34e3f
commit c16dda8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,11 +11,15 @@ jobs:
           - os: macos-latest
             java: 8
             distribution: zulu
-            jobtype: 1
+            scala: 3.x
           - os: ubuntu-latest
             java: 8
             distribution: zulu
-            jobtype: 1
+            scala: 3.x
+          - os: ubuntu-latest
+            java: 8
+            distribution: zulu
+            scala: 2.12.x
     runs-on: ${{ matrix.os }}
     env:
       JAVA_OPTS: -Xms800M -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=128M -Dfile.encoding=UTF-8
@@ -30,6 +34,6 @@ jobs:
     - uses: sbt/setup-sbt@v1
     - shell: bash
       run: |
-        sbt -v clean compile || true
+        sbt -v clean "++${{ matrix.scala }}" compile || true
         sleep 1
-        sbt -v test scripted
+        sbt -v "++${{ matrix.scala }}" test scripted
diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ lazy val root = (project in file("."))
     },
     scriptedLaunchOpts ++= Seq("-Xmx1024M", "-Xss4M", "-Dplugin.version=" + version.value),
     scriptedBufferLog := false,
-    crossSbtVersions := List(scala3, "2.12.20"),
+    crossScalaVersions := List(scala3, "2.12.20"),
     (pluginCrossBuild / sbtVersion) := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.5.8"