This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch gradle in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 1e9b200fc060c2a5e30b487c2fd37896aad64b4f Author: Matteo Merli <[email protected]> AuthorDate: Wed Mar 25 06:53:53 2026 -0700 Use gradle/actions Develocity injection instead of settings plugin Let the gradle/actions/setup-gradle action handle Develocity configuration via its injection mechanism. This ensures the access key format is handled correctly regardless of whether the org-level secret uses the server-prefixed format or bare token. Remove the Develocity plugin from settings.gradle.kts and version catalog, and enable injection with develocity-url in all workflows. --- .github/workflows/codeql.yaml | 3 +++ .github/workflows/pulsar-ci-flaky.yaml | 3 ++- .github/workflows/pulsar-ci.yaml | 24 ++++++++++++++++-------- gradle/libs.versions.toml | 1 - settings.gradle.kts | 18 ------------------ 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index a9cfbdecce5..12de6170dcf 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -63,6 +63,9 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c + with: + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/pulsar-ci-flaky.yaml b/.github/workflows/pulsar-ci-flaky.yaml index 6c0570c340c..ff61ff678c5 100644 --- a/.github/workflows/pulsar-ci-flaky.yaml +++ b/.github/workflows/pulsar-ci-flaky.yaml @@ -206,7 +206,8 @@ jobs: uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: cache-read-only: false - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org - name: Run unit test group BROKER_FLAKY run: | diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml index a338b51dc03..8e59c8df2f4 100644 --- a/.github/workflows/pulsar-ci.yaml +++ b/.github/workflows/pulsar-ci.yaml @@ -178,7 +178,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Build, check licenses and code style @@ -305,7 +306,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Restore build outputs from build job @@ -410,7 +412,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Build with Gradle @@ -448,7 +451,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Restore build outputs from build job @@ -564,7 +568,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Restore build outputs from build job @@ -685,7 +690,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Restore build outputs from build job @@ -808,7 +814,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Restore build outputs from build job @@ -923,7 +930,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: - develocity-injection-enabled: false + develocity-injection-enabled: true + develocity-url: https://develocity.apache.org add-job-summary: always - name: Initialize CodeQL diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6db5f005a38..a6843c120f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -585,7 +585,6 @@ datasketches-memory = { module = "org.apache.datasketches:datasketches-memory", datasketches-java = { module = "org.apache.datasketches:datasketches-java", version = "6.1.1" } [plugins] -develocity = { id = "com.gradle.develocity", version = "4.0.2" } lightproto = { id = "io.streamnative.lightproto", version.ref = "lightproto" } nar = { id = "io.github.merlimat.nar", version = "0.1.3" } protobuf = { id = "com.google.protobuf", version = "0.9.6" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 39340a133a1..203dc0065a8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,24 +24,6 @@ pluginManagement { } } -plugins { - // Version must be hardcoded here — settings.gradle.kts is evaluated before - // the version catalog. Keep in sync with libs.plugins.develocity. - id("com.gradle.develocity") version "4.0.2" -} - -develocity { - projectId = "pulsar" - server = "https://develocity.apache.org"; - buildScan { - uploadInBackground = System.getenv("GITHUB_ACTIONS") == null - publishing.onlyIf { it.isAuthenticated } - obfuscation { - ipAddresses { it.map { _ -> "0.0.0.0" } } - } - } -} - dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories {
