From 3f3a19aa8a71106f30e7d01f838863c5c555f55d Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Mon, 10 Mar 2025 11:29:33 +0100
Subject: [PATCH 1/2] Disable cache require clean on CI

---
 project/Build.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/Build.scala b/project/Build.scala
index b61a0445753b..ab4d2960774c 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -349,6 +349,7 @@ object Build {
           buildCache
             .withLocal(buildCache.local.withEnabled(true).withStoreEnabled(true))
             .withRemote(buildCache.remote.withEnabled(true).withStoreEnabled(isInsideCI))
+            .withRequireClean(!isInsideCI)
         )
         .withTestRetry(
           config.testRetry

From 91b2ed2c6454044c0ad924a4224ed1a8934f555b Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Mon, 10 Mar 2025 15:02:36 +0100
Subject: [PATCH 2/2] Activate caching of tests in CI

---
 project/Build.scala | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index ab4d2960774c..5921f5138dcc 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -6,6 +6,8 @@ import ScaladocGeneration._
 import com.jsuereth.sbtpgp.PgpKeys
 import sbt.Keys.*
 import sbt.*
+import sbt.nio.FileStamper
+import sbt.nio.Keys.*
 import complete.DefaultParsers._
 import pl.project13.scala.sbt.JmhPlugin
 import pl.project13.scala.sbt.JmhPlugin.JmhKeys.Jmh
@@ -279,6 +281,8 @@ object Build {
 
   val fetchScalaJSSource = taskKey[File]("Fetch the sources of Scala.js")
 
+  val extraTestFiles = taskKey[Seq[Path]]("Extra files that affect test execution and caching")
+
   lazy val SourceDeps = config("sourcedeps")
 
   // Settings shared by the build (scoped in ThisBuild). Used in build.sbt
@@ -359,9 +363,14 @@ object Build {
             .withClassesFilter((className, _) => !noRetryTestClasses.contains(className))
         )
     },
-    // Deactivate Develocity's test caching because it caches all tests or nothing.
-    // Also at the moment, it does not take compilation files as inputs.
-    Test / develocityBuildCacheClient := None,
+    // Activate test caching on CI only
+    Test / develocityBuildCacheClient := {
+      if (insideCI.value) (Test / develocityBuildCacheClient).value else None
+    },
+    // base configuration of extraTestFiles to add as extra cache input
+    // see https://docs.gradle.com/develocity/sbt-plugin/#declaring_inputs
+    extraTestFiles / outputFileStamper := FileStamper.Hash,
+    extraTestFiles := Seq.empty
   )
 
   // Settings shared globally (scoped in Global). Used in build.sbt
@@ -442,7 +451,12 @@ object Build {
     Compile / packageBin / packageOptions +=
       Package.ManifestAttributes(
         "Automatic-Module-Name" -> s"${dottyOrganization.replaceAll("-",".")}.${moduleName.value.replaceAll("-",".")}"
-      )
+      ),
+    
+    // add stamps of extra test files in cache key
+    Test / test / buildcache.develocityTaskCacheKeyComponents += (extraTestFiles / outputFileStamps).taskValue,
+    Test / testOnly / buildcache.develocityInputTaskCacheKeyComponents += (extraTestFiles / outputFileStamps).taskValue,
+    Test / testQuick / buildcache.develocityInputTaskCacheKeyComponents += (extraTestFiles / outputFileStamps).taskValue
   )
 
   // Settings used for projects compiled only with Java
@@ -1023,6 +1037,12 @@ object Build {
           sjsSources
         } (Set(scalaJSIRSourcesJar)).toSeq
       }.taskValue,
+
+    // declare extra test files to compute cache key
+    extraTestFiles ++= {
+      val directory = (ThisBuild / baseDirectory).value / "tests"
+      directory.allPaths.get.map(_.toPath)
+    }
   )
 
   def insertClasspathInArgs(args: List[String], cp: String): List[String] = {
@@ -1812,6 +1832,12 @@ object Build {
           "-Ddotty.tests.classes.scalaJSLibrary=" + findArtifactPath(externalJSDeps, "scalajs-library_2.13"),
         )
       },
+      // declare extra test files to compute cache key
+      extraTestFiles ++= {
+        val testsDir = (ThisBuild / baseDirectory).value / "tests"
+        val directories = Seq(testsDir / "neg-scalajs", testsDir / "run")
+        directories.flatMap(_.allPaths.get).map(_.toPath)
+      }
     )
 
   lazy val `scala3-bench` = project.in(file("bench")).asDottyBench(NonBootstrapped)
@@ -2046,6 +2072,10 @@ object Build {
       testDocumentationRoot := (baseDirectory.value / "test-documentations").getAbsolutePath,
       Test / buildInfoPackage := "dotty.tools.scaladoc.test",
       BuildInfoPlugin.buildInfoScopedSettings(Test),
+      extraTestFiles ++= {
+        val directory = (Test / Build.testcasesSourceRoot).value
+        file(directory).allPaths.get.map(_.toPath)
+      }
     )
 
   // various scripted sbt tests