Use access key based authentication for Gradle build cache

ben-manes · Feb 22, 2024 · 21ffb8a · 21ffb8a
1 parent 6c305e1
commit 21ffb8a
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 21 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   ALLOWED_ENDPOINTS: >
     api.adoptium.net:443

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   PUBLISH_JDK: 21
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   ALLOWED_ENDPOINTS: >
     *.actions.githubusercontent.com:443

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -21,7 +21,6 @@ permissions:
   security-events: write
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 11
 

diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -7,7 +7,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 

diff --git a/.github/workflows/dependency-submission-pr-retreive.yml b/.github/workflows/dependency-submission-pr-retreive.yml
@@ -6,7 +6,6 @@ on:
     types: [completed]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 

diff --git a/.github/workflows/dependency-submission-pr-submit.yml b/.github/workflows/dependency-submission-pr-submit.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 

diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 11
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 11
 

diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
@@ -5,7 +5,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:

diff --git a/gradle/gradle-enterprise.gradle b/gradle/gradle-enterprise.gradle
@@ -23,16 +23,10 @@ gradleEnterprise {
 
 buildCache {
   local.enabled = true
-  remote(HttpBuildCache) {
-    url = 'https://caffeine.gradle-enterprise.cloud/cache/'
+  remote(gradleEnterprise.buildCache) {
     enabled = true
-    def cachePassword = settings.ext.find('gradleEnterpriseCachePassword')
-        ?: System.env.GRADLE_ENTERPRISE_CACHE_PASSWORD
+    def accessKey = System.env.GRADLE_ENTERPRISE_ACCESS_KEY
     // Check cache password presence to avoid build cache errors on PR builds when not present
-    push = System.env.CI && cachePassword
-    credentials {
-      username = 'ci'
-      password = cachePassword
-    }
+    push = System.env.CI && accessKey
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ on: @@
     permissions: read-all
     env:
-      GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
     jobs:
@@ Expand Down @@