HYDRA-2663: Ignore test sources in changedProjectsInCompile (#9)

whisklabs · Aug 12, 2024 · 2f44446 · 2f44446
1 parent 6c598b4
commit 2f44446
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/main/scala/com/elarib/PartialSbtPlugin.scala b/src/main/scala/com/elarib/PartialSbtPlugin.scala
@@ -47,7 +47,8 @@ object PartialSbtPlugin extends AutoPlugin {
       baseDirectory: File,
       loadedBuild: LoadedBuild,
       partialSbtExcludedFiles: Seq[File],
-      dependencyFilter: ClasspathDep[ProjectRef] => Boolean
+      dependencyFilter: ClasspathDep[ProjectRef] => Boolean,
+      excludeTestFiles: Boolean
   ) =
     Command(name)(_ => PartialSbParser.changeGetterParser)((st, changeGetter) => {
 
@@ -62,7 +63,8 @@ object PartialSbtPlugin extends AutoPlugin {
           baseDirectory,
           loadedBuild.allProjectRefs,
           transitiveCompileDependencyMap,
-          partialSbtExcludedFiles
+          partialSbtExcludedFiles,
+          excludeTestFiles
         )
 
       logger.debug(s"${changedProjects.size} projects have been changed")
@@ -91,22 +93,25 @@ object PartialSbtPlugin extends AutoPlugin {
         baseDirectory.value,
         loadedBuild.value,
         BuildKeys.partialSbtExcludedFiles.value,
-        Function.const(true)
+        Function.const(true),
+        excludeTestFiles = false
       ),
       commands += changedProjectsCommand("changedProjectsInCompile")(
         buildDependencies.value,
         baseDirectory.value,
         loadedBuild.value,
         BuildKeys.partialSbtExcludedFiles.value,
-        hasCompileConfiguration
+        hasCompileConfiguration,
+        excludeTestFiles = true
       )
     )
 
   private def findChangedModules(changeGetter: ChangeGetter)(
       baseDir: sbt.File,
       allProjectRefs: Seq[(ProjectRef, ResolvedProject)],
       buildDeps: DependencyMap[ProjectRef],
-      excludedFiles: Seq[sbt.File]
+      excludedFiles: Seq[sbt.File],
+      excludeTestFiles: Boolean
   ): Seq[ResolvedProject] = {
 
     val projectMap: Map[ProjectRef, ResolvedProject] = allProjectRefs.toMap
@@ -144,13 +149,19 @@ object PartialSbtPlugin extends AutoPlugin {
 
         val diffsFiles: Seq[sbt.File] = changeGetter.changes.filterNot(f => isFileExcluded(baseDir)(f, excludedFiles))
 
+        def isExcludedTestFile(file: sbt.File, resolvedProject: ResolvedProject): Boolean =
+          excludeTestFiles && file.getAbsolutePath.startsWith((resolvedProject.base / "src" / "test").getAbsolutePath)
+
         def findContainingProject(file: File): Option[(ProjectRef, ResolvedProject)] =
           modulesWithPath
             .filter { case (_, resolvedProject) =>
               file.getAbsolutePath.contains(resolvedProject.base.getAbsolutePath)
             }
             .sortBy(_._2.base.getAbsolutePath.length)
             .lastOption
+            .filterNot { case (_, resolvedProject) =>
+              isExcludedTestFile(file, resolvedProject)
+            }
 
         diffsFiles
           .flatMap(findContainingProject)

diff --git a/src/sbt-test/test-projects/multi-module-project/changes/6.log b/src/sbt-test/test-projects/multi-module-project/changes/6.log
@@ -1 +1,2 @@
-src/libs/testKit/build.sbt
+src/libs/testKit/build.sbt
+src/libs/lib-1/src/test/scala/Test.scala