CommunityTests: split into separate projects

The tests run too long, so let's split them apart so we can run them in parallel.
scalameta · Sep 26, 2024 · eb17315 · eb17315
1 parent 6c8bc5b
commit eb17315
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,6 +43,7 @@ jobs:
       matrix:
         java: [ '11' ]
         os: [windows-latest, ubuntu-latest]
+        group: [scala2, scala3, other]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -54,7 +55,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'sbt'
-      - run: sbt communityTests/test
+      - run: sbt communityTests/${{ matrix.group }}/test
   formatting:
     runs-on: ubuntu-latest
     steps:

diff --git a/build.sbt b/build.sbt
@@ -218,18 +218,28 @@ lazy val tests = crossProject(JVMPlatform).withoutSuffixFor(JVMPlatform)
     }),
   ).enablePlugins(BuildInfoPlugin).dependsOn(core, dynamic, cli)
 
-lazy val communityTests = project.in(file("scalafmt-tests-community")).settings(
-  publish / skip := true,
-  libraryDependencies ++= Seq(
-    // Test dependencies
-    "com.lihaoyi" %% "scalatags" % "0.13.1",
-    scalametaTestkit,
-    munit.value,
-  ),
-  scalacOptions ++= scalacJvmOptions.value,
-  javaOptions += "-Dfile.encoding=UTF8",
-  buildInfoPackage := "org.scalafmt.tests",
-).enablePlugins(BuildInfoPlugin).dependsOn(coreJVM)
+lazy val communityTestsCommon = project
+  .in(file("scalafmt-tests-community/common")).settings(
+    communityTestsSettings,
+    libraryDependencies ++= Seq(
+      // Test dependencies
+      "com.lihaoyi" %% "scalatags" % "0.13.1",
+      scalametaTestkit,
+      munit.value,
+    ),
+  ).enablePlugins(BuildInfoPlugin).dependsOn(coreJVM)
+
+lazy val communityTestsScala2 = project
+  .in(file("scalafmt-tests-community/scala2")).settings(communityTestsSettings)
+  .enablePlugins(BuildInfoPlugin).dependsOn(communityTestsCommon)
+
+lazy val communityTestsScala3 = project
+  .in(file("scalafmt-tests-community/scala3")).settings(communityTestsSettings)
+  .enablePlugins(BuildInfoPlugin).dependsOn(communityTestsCommon)
+
+lazy val communityTestsOther = project
+  .in(file("scalafmt-tests-community/other")).settings(communityTestsSettings)
+  .enablePlugins(BuildInfoPlugin).dependsOn(communityTestsCommon)
 
 lazy val benchmarks = project.in(file("scalafmt-benchmarks")).settings(
   publish / skip := true,
@@ -286,3 +296,10 @@ lazy val buildInfoSettings: Seq[Def.Setting[_]] = Seq(
   buildInfoPackage := "org.scalafmt",
   buildInfoObject := "Versions",
 )
+
+lazy val communityTestsSettings: Seq[Def.Setting[_]] = Seq(
+  publish / skip := true,
+  scalacOptions ++= scalacJvmOptions.value,
+  javaOptions += "-Dfile.encoding=UTF8",
+  buildInfoPackage := "org.scalafmt.tests",
+)
diff --git a/...g/scalafmt/community/CommunityBuild.scala → ...fmt/community/common/CommunityBuild.scala b/...g/scalafmt/community/CommunityBuild.scala → ...fmt/community/common/CommunityBuild.scala
@@ -1,4 +1,4 @@
-package org.scalafmt.community
+package org.scalafmt.community.common
 
 import scala.meta._
 

diff --git a/...alafmt/community/CommunityRepoSuite.scala → ...community/common/CommunityRepoSuite.scala b/...alafmt/community/CommunityRepoSuite.scala → ...community/common/CommunityRepoSuite.scala
@@ -1,4 +1,4 @@
-package org.scalafmt.community
+package org.scalafmt.community.common
 
 import scala.meta._
 

diff --git a/...g/scalafmt/community/CommunitySuite.scala → ...fmt/community/common/CommunitySuite.scala b/...g/scalafmt/community/CommunitySuite.scala → ...fmt/community/common/CommunitySuite.scala
@@ -1,4 +1,4 @@
-package org.scalafmt.community
+package org.scalafmt.community.common
 
 import org.scalafmt.config._
 

diff --git a/.../org/scalafmt/community/TestHelpers.scala → ...alafmt/community/common/TestHelpers.scala b/.../org/scalafmt/community/TestHelpers.scala → ...alafmt/community/common/TestHelpers.scala
@@ -1,4 +1,4 @@
-package org.scalafmt.community
+package org.scalafmt.community.common
 
 import org.scalafmt.CompatCollections.JavaConverters._
 import org.scalafmt.CompatCollections.ParConverters._

diff --git a/...la/org/scalafmt/community/TestStats.scala → ...scalafmt/community/common/TestStats.scala b/...la/org/scalafmt/community/TestStats.scala → ...scalafmt/community/common/TestStats.scala
@@ -1,4 +1,4 @@
-package org.scalafmt.community
+package org.scalafmt.community.common
 
 case class TestStats(
     checkedFiles: Int,

diff --git a/...a/org/scalafmt/community/TestStyles.scala → ...calafmt/community/common/TestStyles.scala b/...a/org/scalafmt/community/TestStyles.scala → ...calafmt/community/common/TestStyles.scala
@@ -1,4 +1,4 @@
-package org.scalafmt.community
+package org.scalafmt.community.common
 
 import org.scalafmt.config._
 import org.scalafmt.rewrite._

diff --git a/...lafmt/community/CommunityMunitSuite.scala → ...community/other/CommunityMunitSuite.scala b/...lafmt/community/CommunityMunitSuite.scala → ...community/other/CommunityMunitSuite.scala
@@ -1,4 +1,6 @@
-package org.scalafmt.community
+package org.scalafmt.community.other
+
+import org.scalafmt.community.common.CommunityRepoSuite
 
 import scala.meta._
 

diff --git a/...afmt/community/CommunityScala2Suite.scala → ...mmunity/scala2/CommunityScala2Suite.scala b/...afmt/community/CommunityScala2Suite.scala → ...mmunity/scala2/CommunityScala2Suite.scala
@@ -1,4 +1,6 @@
-package org.scalafmt.community
+package org.scalafmt.community.scala2
+
+import org.scalafmt.community.common.CommunityRepoSuite
 
 import scala.meta._
 

diff --git a/...afmt/community/CommunityScala3Suite.scala → ...mmunity/scala3/CommunityScala3Suite.scala b/...afmt/community/CommunityScala3Suite.scala → ...mmunity/scala3/CommunityScala3Suite.scala
@@ -1,4 +1,6 @@
-package org.scalafmt.community
+package org.scalafmt.community.scala3
+
+import org.scalafmt.community.common.CommunityRepoSuite
 
 import scala.meta._