Align build cache config across builds (#7151)

* Align build cache config across builds * Add a reminder to synchronise buildCache config between builds
detekt · Apr 9, 2024 · 42bd630 · 42bd630
1 parent 6d0faa5
commit 42bd630
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -1,6 +1,7 @@
 rootProject.name = "build-logic"
 
 plugins {
+    id("com.gradle.develocity") version "3.17"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -14,17 +15,15 @@ dependencyResolutionManagement {
 
 val isCiBuild = providers.environmentVariable("CI").isPresent
 
+// Ensure buildCache config is kept in sync with all builds (root, build-logic & detekt-gradle-plugin)
 buildCache {
     local {
         isEnabled = !isCiBuild
     }
-    remote<HttpBuildCache> {
-        isPush = isCiBuild
+    remote(develocity.buildCache) {
+        server = "https://ge.detekt.dev"
         isEnabled = true
-        url = uri("https://ge.detekt.dev/cache/")
-        credentials {
-            username = providers.environmentVariable("GRADLE_CACHE_USERNAME").orNull
-            password = providers.environmentVariable("GRADLE_CACHE_PASSWORD").orNull
-        }
+        val accessKey = System.getenv("DEVELOCITY_ACCESS_KEY")
+        isPush = isCiBuild && !accessKey.isNullOrEmpty()
     }
 }
diff --git a/detekt-gradle-plugin/settings.gradle.kts b/detekt-gradle-plugin/settings.gradle.kts
@@ -19,17 +19,15 @@ plugins {
 
 val isCiBuild = providers.environmentVariable("CI").isPresent
 
+// Ensure buildCache config is kept in sync with all builds (root, build-logic & detekt-gradle-plugin)
 buildCache {
     local {
         isEnabled = !isCiBuild
     }
-    remote<HttpBuildCache> {
-        isPush = isCiBuild
+    remote(develocity.buildCache) {
+        server = "https://ge.detekt.dev"
         isEnabled = true
-        url = uri("https://ge.detekt.dev/cache/")
-        credentials {
-            username = providers.environmentVariable("GRADLE_CACHE_USERNAME").orNull
-            password = providers.environmentVariable("GRADLE_CACHE_PASSWORD").orNull
-        }
+        val accessKey = System.getenv("DEVELOCITY_ACCESS_KEY")
+        isPush = isCiBuild && !accessKey.isNullOrEmpty()
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -61,11 +61,13 @@ develocity {
     }
 }
 
+// Ensure buildCache config is kept in sync with all builds (root, build-logic & detekt-gradle-plugin)
 buildCache {
     local {
         isEnabled = !isCiBuild
     }
     remote(develocity.buildCache) {
+        server = "https://ge.detekt.dev"
         isEnabled = true
         val accessKey = System.getenv("DEVELOCITY_ACCESS_KEY")
         isPush = isCiBuild && !accessKey.isNullOrEmpty()