From 10de83bc4489ab8013c690b29fc0effbd516d5e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 22:37:36 +0000 Subject: [PATCH 1/2] chore(deps): update dependency gradle to v8.11 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb602ee2af0..82dd18b2043 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 4d5011d710a535c00c3ab2e663fe49572ea104b6 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Mon, 18 Nov 2024 09:53:21 -0600 Subject: [PATCH 2/2] Replace GRADLE_ENTERPRISE_ACCESS_KEY with DEVELOCITY_ACCESS_KEY --- .github/workflows/benchmark-tags.yml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/build.yml | 2 +- settings.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark-tags.yml b/.github/workflows/benchmark-tags.yml index 9953fef010a..955a4bdcd0a 100644 --- a/.github/workflows/benchmark-tags.yml +++ b/.github/workflows/benchmark-tags.yml @@ -55,7 +55,7 @@ jobs: - name: Run jmh run: ./gradlew jmhJar env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Run Benchmark run: | diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 7a8160dbca7..bb47139b039 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,7 +25,7 @@ jobs: - name: Run jmh run: ./gradlew jmhJar env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Run Benchmark run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7a4430a67e..f2275e49bdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" "-Porg.gradle.java.installations.auto-download=false" env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # JMH-based tests run only if this environment variable is set to true RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }} diff --git a/settings.gradle.kts b/settings.gradle.kts index 4edff174f84..ae077b6c2dc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -70,7 +70,7 @@ include(":animal-sniffer-signature") val gradleEnterpriseServer = "https://ge.opentelemetry.io" val isCI = System.getenv("CI") != null -val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: "" +val geAccessKey = System.getenv("DEVELOCITY_ACCESS_KEY") ?: "" // if GE access key is not given and we are in CI, then we publish to scans.gradle.com val useScansGradleCom = isCI && geAccessKey.isEmpty()