parallelize scripted

scriptedBatchExecution effectively ignores custom build.properties, so this takes a different approach to customizing the scripted based on sbt/JDK version
scalacenter · Apr 23, 2024 · 3f9b5be · 3f9b5be
1 parent aa7033a
commit 3f9b5be
Show file tree

Hide file tree

Showing 41 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: temurin:8
+      - run: rm -rf src/sbt-test/skip-sbt1.4
       - run: sbt test scripted
   jdk11:
     name: JDK11 tests
@@ -22,6 +23,7 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: temurin:11
+      - run: rm -rf src/sbt-test/skip-sbt1.4
       - run: sbt test scripted
   jdk17:
     name: JDK17 tests
@@ -31,7 +33,10 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: temurin:17
-      - run: sbt "test; scripted sbt-*/* skip-windows/*"
+      - run: rm -rf src/sbt-test/skip-sbt1.4
+      - run: rm -rf src/sbt-test/skip-java17+
+      - run: sbt test scripted
+
   jdk21:
     name: JDK21 tests
     runs-on: ubuntu-latest
@@ -40,7 +45,8 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: temurin:21
-      - run: sbt "test; scripted sbt-scalafix/* skip-windows/*"
+      - run: rm -rf src/sbt-test/skip-java17+
+      - run: sbt test scripted
   windows:
     name: Windows tests
     runs-on: windows-latest

diff --git a/build.sbt b/build.sbt
@@ -56,9 +56,7 @@ scriptedSbt := {
   if (jdk >= 21)
     "1.9.0" // first release that supports JDK21
   else
-    // https://github.com/sbt/sbt/commit/3b9b200
-    // 1.4.[0-2] force batch mode which is not compatible with custom build.properties
-    "1.4.3"
+    (pluginCrossBuild / sbtVersion).value
 }
 
 libraryDependencies += compilerPlugin(scalafixSemanticdb)
@@ -75,6 +73,8 @@ scalacOptions ++= List(
 enablePlugins(ScriptedPlugin)
 sbtPlugin := true
 scriptedBufferLog := false
+scriptedBatchExecution := true
+scriptedParallelInstances := 4
 scriptedLaunchOpts ++= Seq(
   "-Xmx2048M",
   s"-Dplugin.version=${version.value}",

diff --git a/src/sbt-test/sbt-1.5/cross-build-scalafixScalaBinaryVersion/project/build.properties b/src/sbt-test/sbt-1.5/cross-build-scalafixScalaBinaryVersion/project/build.properties
diff --git a/src/sbt-test/sbt-1.5/scala-3/project/build.properties b/src/sbt-test/sbt-1.5/scala-3/project/build.properties
diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/project/build.properties b/src/sbt-test/sbt-1.5/scalafixEnable/project/build.properties
diff --git a/src/sbt-test/sbt-1.5/testkit/project/build.properties b/src/sbt-test/sbt-1.5/testkit/project/build.properties
diff --git a/...t-test/skip-java17/scalafixResolvers/.env → ...-test/skip-java17+/scalafixResolvers/.env b/...t-test/skip-java17/scalafixResolvers/.env → ...-test/skip-java17+/scalafixResolvers/.env
diff --git a/...t/skip-java17/scalafixResolvers/build.sbt → .../skip-java17+/scalafixResolvers/build.sbt b/...t/skip-java17/scalafixResolvers/build.sbt → .../skip-java17+/scalafixResolvers/build.sbt
diff --git a/...a17/scalafixResolvers/project/plugins.sbt → ...17+/scalafixResolvers/project/plugins.sbt b/...a17/scalafixResolvers/project/plugins.sbt → ...17+/scalafixResolvers/project/plugins.sbt
diff --git a/...t-test/skip-java17/scalafixResolvers/test → ...-test/skip-java17+/scalafixResolvers/test b/...t-test/skip-java17/scalafixResolvers/test → ...-test/skip-java17+/scalafixResolvers/test
diff --git a/...alafixScalaBinaryVersion/.scalafix-2.conf → ...alafixScalaBinaryVersion/.scalafix-2.conf b/...alafixScalaBinaryVersion/.scalafix-2.conf → ...alafixScalaBinaryVersion/.scalafix-2.conf
diff --git a/...alafixScalaBinaryVersion/.scalafix-3.conf → ...alafixScalaBinaryVersion/.scalafix-3.conf b/...alafixScalaBinaryVersion/.scalafix-3.conf → ...alafixScalaBinaryVersion/.scalafix-3.conf
diff --git a/...uild-scalafixScalaBinaryVersion/build.sbt → ...uild-scalafixScalaBinaryVersion/build.sbt b/...uild-scalafixScalaBinaryVersion/build.sbt → ...uild-scalafixScalaBinaryVersion/build.sbt
diff --git a/...fixScalaBinaryVersion/project/plugins.sbt → ...fixScalaBinaryVersion/project/plugins.sbt b/...fixScalaBinaryVersion/project/plugins.sbt → ...fixScalaBinaryVersion/project/plugins.sbt
diff --git a/...BinaryVersion/src/main/scala-2/Main.scala → ...BinaryVersion/src/main/scala-2/Main.scala b/...BinaryVersion/src/main/scala-2/Main.scala → ...BinaryVersion/src/main/scala-2/Main.scala
diff --git a/...sion/src/main/scala-2/Main.scala.expected → ...sion/src/main/scala-2/Main.scala.expected b/...sion/src/main/scala-2/Main.scala.expected → ...sion/src/main/scala-2/Main.scala.expected
diff --git a/...BinaryVersion/src/main/scala-3/Main.scala → ...BinaryVersion/src/main/scala-3/Main.scala b/...BinaryVersion/src/main/scala-3/Main.scala → ...BinaryVersion/src/main/scala-3/Main.scala
diff --git a/...sion/src/main/scala-3/Main.scala.expected → ...sion/src/main/scala-3/Main.scala.expected b/...sion/src/main/scala-3/Main.scala.expected → ...sion/src/main/scala-3/Main.scala.expected
diff --git a/...oss-build-scalafixScalaBinaryVersion/test → ...oss-build-scalafixScalaBinaryVersion/test b/...oss-build-scalafixScalaBinaryVersion/test → ...oss-build-scalafixScalaBinaryVersion/test
diff --git a/src/sbt-test/sbt-1.5/scala-3/build.sbt → src/sbt-test/skip-sbt1.4/scala-3/build.sbt b/src/sbt-test/sbt-1.5/scala-3/build.sbt → src/sbt-test/skip-sbt1.4/scala-3/build.sbt
diff --git a/...-test/sbt-1.5/scala-3/project/plugins.sbt → ...t/skip-sbt1.4/scala-3/project/plugins.sbt b/...-test/sbt-1.5/scala-3/project/plugins.sbt → ...t/skip-sbt1.4/scala-3/project/plugins.sbt
diff --git a/...c/main/scala/SignificantIndentation.scala → ...c/main/scala/SignificantIndentation.scala b/...c/main/scala/SignificantIndentation.scala → ...c/main/scala/SignificantIndentation.scala
diff --git a/src/sbt-test/sbt-1.5/scala-3/test → src/sbt-test/skip-sbt1.4/scala-3/test b/src/sbt-test/sbt-1.5/scala-3/test → src/sbt-test/skip-sbt1.4/scala-3/test
diff --git a/...sbt-test/sbt-1.5/scalafixEnable/build.sbt → ...test/skip-sbt1.4/scalafixEnable/build.sbt b/...sbt-test/sbt-1.5/scalafixEnable/build.sbt → ...test/skip-sbt1.4/scalafixEnable/build.sbt
diff --git a/...bt-1.5/scalafixEnable/project/plugins.sbt → ...sbt1.4/scalafixEnable/project/plugins.sbt b/...bt-1.5/scalafixEnable/project/plugins.sbt → ...sbt1.4/scalafixEnable/project/plugins.sbt
diff --git a/...Enable/scala210/src/main/scala/Main.scala → ...Enable/scala210/src/main/scala/Main.scala b/...Enable/scala210/src/main/scala/Main.scala → ...Enable/scala210/src/main/scala/Main.scala
diff --git a/...Enable/scala211/src/main/scala/Main.scala → ...Enable/scala211/src/main/scala/Main.scala b/...Enable/scala211/src/main/scala/Main.scala → ...Enable/scala211/src/main/scala/Main.scala
diff --git a/...Enable/scala212/src/main/scala/Main.scala → ...Enable/scala212/src/main/scala/Main.scala b/...Enable/scala212/src/main/scala/Main.scala → ...Enable/scala212/src/main/scala/Main.scala
diff --git a/...c/main/scala/SignificantIndentation.scala → ...c/main/scala/SignificantIndentation.scala b/...c/main/scala/SignificantIndentation.scala → ...c/main/scala/SignificantIndentation.scala
diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/test → src/sbt-test/skip-sbt1.4/scalafixEnable/test b/src/sbt-test/sbt-1.5/scalafixEnable/test → src/sbt-test/skip-sbt1.4/scalafixEnable/test
diff --git a/src/sbt-test/sbt-1.5/testkit/build.sbt → src/sbt-test/skip-sbt1.4/testkit/build.sbt b/src/sbt-test/sbt-1.5/testkit/build.sbt → src/sbt-test/skip-sbt1.4/testkit/build.sbt
diff --git a/...put/src/main/scala-2.13/fix/Source3.scala → ...put/src/main/scala-2.13/fix/Source3.scala b/...put/src/main/scala-2.13/fix/Source3.scala → ...put/src/main/scala-2.13/fix/Source3.scala
diff --git a/...ut/src/main/scala/fix/SemanticBasic.scala → ...ut/src/main/scala/fix/SemanticBasic.scala b/...ut/src/main/scala/fix/SemanticBasic.scala → ...ut/src/main/scala/fix/SemanticBasic.scala
diff --git a/...put/src/main/scala-2.13/fix/Source3.scala → ...put/src/main/scala-2.13/fix/Source3.scala b/...put/src/main/scala-2.13/fix/Source3.scala → ...put/src/main/scala-2.13/fix/Source3.scala
diff --git a/...ut/src/main/scala/fix/SemanticBasic.scala → ...ut/src/main/scala/fix/SemanticBasic.scala b/...ut/src/main/scala/fix/SemanticBasic.scala → ...ut/src/main/scala/fix/SemanticBasic.scala
diff --git a/.../sbt-1.5/testkit/project/TargetAxis.scala → ...p-sbt1.4/testkit/project/TargetAxis.scala b/.../sbt-1.5/testkit/project/TargetAxis.scala → ...p-sbt1.4/testkit/project/TargetAxis.scala
diff --git a/...-test/sbt-1.5/testkit/project/plugins.sbt → ...t/skip-sbt1.4/testkit/project/plugins.sbt b/...-test/sbt-1.5/testkit/project/plugins.sbt → ...t/skip-sbt1.4/testkit/project/plugins.sbt
diff --git a/...ources/META-INF/services/scalafix.v1.Rule → ...ources/META-INF/services/scalafix.v1.Rule b/...ources/META-INF/services/scalafix.v1.Rule → ...ources/META-INF/services/scalafix.v1.Rule
diff --git a/...t/rules/src/main/scala/fix/Semantic.scala → ...t/rules/src/main/scala/fix/Semantic.scala b/...t/rules/src/main/scala/fix/Semantic.scala → ...t/rules/src/main/scala/fix/Semantic.scala
diff --git a/src/sbt-test/sbt-1.5/testkit/test → src/sbt-test/skip-sbt1.4/testkit/test b/src/sbt-test/sbt-1.5/testkit/test → src/sbt-test/skip-sbt1.4/testkit/test
diff --git a/...src/test/scala/fix/InputOutputSuite.scala → ...src/test/scala/fix/InputOutputSuite.scala b/...src/test/scala/fix/InputOutputSuite.scala → ...src/test/scala/fix/InputOutputSuite.scala