From 874d8a5f7f8e76d9f25cfc2f9507208db31b5ff3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 9 Dec 2025 12:03:41 -0800 Subject: [PATCH] Use develocity build cache in PRs and local builds Ported from https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15579 --- settings.gradle.kts | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index bdc5f846c..4c006d845 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,24 +29,19 @@ val develocityServer = "https://develocity.opentelemetry.io" val isCI = System.getenv("CI") != null val develocityAccessKey = System.getenv("DEVELOCITY_ACCESS_KEY") ?: "" -// if develocity access key is not given and we are in CI, then we publish to scans.gradle.com -val useScansGradleCom = isCI && develocityAccessKey.isEmpty() - develocity { - if (useScansGradleCom) { - buildScan { - termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use" - termsOfUseAgree = "yes" - } - } else { + if (develocityAccessKey.isNotEmpty()) { server = develocityServer - buildScan { - publishing.onlyIf { it.isAuthenticated } - } } buildScan { - uploadInBackground = !isCI + if (develocityAccessKey.isNotEmpty()) { + } else if (isCI) { + termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use" + termsOfUseAgree = "yes" + } else { + publishing.onlyIf { false } + } capture { fileFingerprints = true @@ -60,11 +55,10 @@ develocity { } } -if (!useScansGradleCom) { - buildCache { - remote(develocity.buildCache) { - isPush = isCI && develocityAccessKey.isNotEmpty() - } +buildCache { + remote(HttpBuildCache::class) { + url = uri("$develocityServer/cache/") + isPush = isCI && develocityAccessKey.isNotEmpty() } }