From 370a4ee8b34fd1c169e92b4756ce62043003e13f Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 29 Apr 2024 13:15:05 +0200 Subject: [PATCH] Upgrade to gradle-enterprise-conventions 0.0.17 Closes gh-32724 --- .github/workflows/build-and-deploy-snapshot.yml | 4 +--- .github/workflows/ci.yml | 4 +--- ci/pipeline.yml | 4 +--- settings.gradle | 4 ++-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index df667c987668..82f786b62084 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -35,9 +35,7 @@ jobs: env: CI: 'true' GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository - name: Deploy uses: spring-io/artifactory-deploy-action@v0.0.1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2455763a207f..57b0ef267028 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,9 +66,7 @@ jobs: env: CI: 'true' GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./gradlew check antora - name: Send notification uses: ./.github/actions/send-notification diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 337ddac8fb4d..d7c908847090 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -5,9 +5,7 @@ anchors: password: ((github-ci-release-token)) branch: ((branch)) gradle-enterprise-task-params: &gradle-enterprise-task-params - GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) - GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username)) - GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password)) + DEVELOCITY_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) sonatype-task-params: &sonatype-task-params SONATYPE_USERNAME: ((sonatype-username)) SONATYPE_PASSWORD: ((sonatype-password)) diff --git a/settings.gradle b/settings.gradle index ae622052e15a..9278a4dec986 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ plugins { - id "com.gradle.enterprise" version "3.16.2" - id "io.spring.ge.conventions" version "0.0.15" + id "com.gradle.develocity" version "3.17.2" + id "io.spring.ge.conventions" version "0.0.17" id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0" }