Migrate to a single DEVELOCITY_ACCESS_KEY

spring-io · Sep 18, 2024 · 703f14e · 703f14e
1 parent ecc71be
commit 703f14e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 36 deletions.
diff --git a/.github/workflows/spring-artifactory-gradle-release-staging.yml b/.github/workflows/spring-artifactory-gradle-release-staging.yml
@@ -45,11 +45,7 @@ on:
         required: true
       ARTIFACTORY_PASSWORD:
         required: true
-      GRADLE_ENTERPRISE_CACHE_USER:
-        required: false
-      GRADLE_ENTERPRISE_CACHE_PASSWORD:
-        required: false
-      GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
+      DEVELOCITY_ACCESS_KEY:
         required: false
       GPG_PASSPHRASE:
         required: false
@@ -58,10 +54,7 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-  GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   WORKFLOWS_REF: main
 
 jobs:

diff --git a/.github/workflows/spring-artifactory-gradle-release.yml b/.github/workflows/spring-artifactory-gradle-release.yml
@@ -42,11 +42,7 @@ on:
         default: ubuntu-latest
 
     secrets:
-      GRADLE_ENTERPRISE_CACHE_USER:
-        required: false
-      GRADLE_ENTERPRISE_CACHE_PASSWORD:
-        required: false
-      GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
+      DEVELOCITY_ACCESS_KEY:
         required: false
       SPRING_RELEASE_CHAT_WEBHOOK_URL:
         required: false

diff --git a/.github/workflows/spring-artifactory-gradle-snapshot.yml b/.github/workflows/spring-artifactory-gradle-snapshot.yml
@@ -26,11 +26,7 @@ on:
         default: ubuntu-latest
 
     secrets:
-      GRADLE_ENTERPRISE_CACHE_USER:
-        required: false
-      GRADLE_ENTERPRISE_CACHE_PASSWORD:
-        required: false
-      GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
+      DEVELOCITY_ACCESS_KEY:
         required: false
       ARTIFACTORY_USERNAME:
         required: true
@@ -42,10 +38,7 @@ on:
         required: false
 
 env:
-  GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   WORKFLOWS_REF: main
 
 jobs:

diff --git a/.github/workflows/spring-build-and-deploy-docs.yml b/.github/workflows/spring-build-and-deploy-docs.yml
@@ -9,7 +9,7 @@ on:
         type: string
 
     secrets:
-      GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
+      DEVELOCITY_ACCESS_KEY:
         required: false
       DOCS_USERNAME:
         required: true
@@ -25,8 +25,7 @@ on:
         required: true
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
   docs-build:

diff --git a/README.md b/README.md
@@ -7,9 +7,7 @@ To use these workflows in your project a set of organization secrets must be gra
 
 ```
 GH_ACTIONS_REPO_TOKEN
-GRADLE_ENTERPRISE_CACHE_USER
-GRADLE_ENTERPRISE_CACHE_PASSWORD
-GRADLE_ENTERPRISE_SECRET_ACCESS_KEY
+DEVELOCITY_ACCESS_KEY
 JF_ARTIFACTORY_SPRING
 ARTIFACTORY_USERNAME
 ARTIFACTORY_PASSWORD
@@ -21,7 +19,7 @@ GPG_PASSPHRASE
 GPG_PRIVATE_KEY
 ```
 
-The Gradle Enterprise secrets are optional: not used by Maven and Gradle project might not be enrolled for the service.  
+The Develocity secret is optional: not used by Maven and Gradle project might not be enrolled for the service.  
 The `SPRING_RELEASE_CHAT_WEBHOOK_URL` secret is also optional: probably you don't want to notify Google Space about your release, or it is not available for GitHub organization.
 As well as `OSSRH_*` secret, since not all releases might go to Maven Central, e.g. private (commercial) repositories only.
 

diff --git a/samples/ci-snapshot-gradle.yml b/samples/ci-snapshot-gradle.yml
@@ -12,8 +12,6 @@ jobs:
     with:
       gradleTasks: dist
     secrets:
-      GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-      GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-      GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
       ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
diff --git a/samples/release-with-gradle.yml b/samples/release-with-gradle.yml
@@ -12,9 +12,7 @@ jobs:
       buildToolArgs: dist
     secrets:
       GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-      GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-      GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
       ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}