Skip to content

Commit 7bc852a

Browse files
jprinetjprinet
authored
Migrate to Develocity build cache connector (#13387)
1 parent 5312c1f commit 7bc852a

File tree

5 files changed

+5
-30
lines changed

5 files changed

+5
-30
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ jobs:
3131
uses: gradle/gradle-build-action@v2
3232
env:
3333
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
34-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
35-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
3634
with:
3735
arguments: build groovydoc
3836
publish:
@@ -57,8 +55,6 @@ jobs:
5755
uses: gradle/gradle-build-action@v2
5856
env:
5957
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
60-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
61-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
6258
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
6359
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
6460
with:

‎.github/workflows/groovy-joint-workflow.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,9 @@ jobs:
7878
echo "" >> $GITHUB_OUTPUT
7979
echo "buildCache {" >> $GITHUB_OUTPUT
8080
echo " local { enabled = System.getenv('CI') != 'true' }" >> $GITHUB_OUTPUT
81-
echo " remote(HttpBuildCache) {" >> $GITHUB_OUTPUT
81+
echo " remote(gradleEnterprise.buildCache) {" >> $GITHUB_OUTPUT
8282
echo " push = System.getenv('CI') == 'true'" >> $GITHUB_OUTPUT
8383
echo " enabled = true" >> $GITHUB_OUTPUT
84-
echo " url = 'https://ge.grails.org/cache/'" >> $GITHUB_OUTPUT
85-
echo " credentials {" >> $GITHUB_OUTPUT
86-
echo " username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')" >> $GITHUB_OUTPUT
87-
echo " password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')" >> $GITHUB_OUTPUT
88-
echo " }" >> $GITHUB_OUTPUT
8984
echo " }" >> $GITHUB_OUTPUT
9085
echo "}" >> $GITHUB_OUTPUT
9186
echo "" >> $GITHUB_OUTPUT
@@ -102,8 +97,6 @@ jobs:
10297
env:
10398
GRADLE_SCANS_ACCEPT: yes
10499
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
105-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
106-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
107100
with:
108101
build-root-directory: ../groovy
109102
arguments: |
@@ -139,8 +132,6 @@ jobs:
139132
env:
140133
ORG_GRADLE_PROJECT_groovyVersion: ${{ needs.build_groovy.outputs.groovyVersion }}
141134
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
142-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
143-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
144135
with:
145136
arguments: |
146137
build

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747
arguments: assemble
4848
env:
4949
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
50-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
51-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5250
- name: Upload Distribution
5351
if: success()
5452
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4
@@ -74,8 +72,6 @@ jobs:
7472
uses: gradle/gradle-build-action@v2
7573
env:
7674
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
77-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
78-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
7975
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
8076
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
8177
SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
@@ -109,8 +105,6 @@ jobs:
109105
uses: gradle/gradle-build-action@v2
110106
env:
111107
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
112-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
113-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
114108
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
115109
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
116110
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}

‎.github/workflows/retry-release.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ jobs:
4949
arguments: assemble
5050
env:
5151
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
52-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
53-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5452
- name: Upload artifacts to the Github release
5553
id: upload_artifact
5654
if: steps.assemble.outcome == 'success'

‎settings.gradle‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@ gradleEnterprise {
1818

1919
buildCache {
2020
local { enabled = System.getenv('CI') != 'true' }
21-
remote(HttpBuildCache) {
22-
def isAuthenticated = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER') && System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')
21+
remote(gradleEnterprise.buildCache) {
22+
def isAuthenticated = System.getenv('GRADLE_ENTERPRISE_ACCESS_KEY')
2323
push = System.getenv('CI') == 'true' && isAuthenticated
2424
enabled = true
25-
url = 'https://ge.grails.org/cache/'
26-
credentials {
27-
username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')
28-
password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')
29-
}
30-
}}
25+
}
26+
}
3127

3228
rootProject.name = "grails.core.ROOT"
3329

0 commit comments

Comments
 (0)