Skip to content

Commit 89a561a

Browse files
lauritlaurit
authoredMar 27, 2024··
Backport: Use develocity cache connector (#10958)
·
v1.33.6v1.33.2
1 parent e301884 commit 89a561a

6 files changed

+3
-52
lines changed
 

‎.github/workflows/build-common.yml

-18
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ on:
1818
secrets:
1919
GRADLE_ENTERPRISE_ACCESS_KEY:
2020
required: false
21-
GE_CACHE_USERNAME:
22-
required: false
23-
GE_CACHE_PASSWORD:
24-
required: false
2521

2622
jobs:
2723
spotless:
@@ -42,8 +38,6 @@ jobs:
4238
uses: gradle/gradle-build-action@v3
4339
env:
4440
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
45-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
46-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
4741
with:
4842
arguments: spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
4943
cache-read-only: ${{ inputs.cache-read-only }}
@@ -75,8 +69,6 @@ jobs:
7569
uses: gradle/gradle-build-action@v3
7670
env:
7771
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
78-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
79-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
8072
with:
8173
# currently ignoring inputs.no-build-cache and always running with --no-build-cache
8274
# see https://github.com/jk1/Gradle-License-Report/issues/231
@@ -149,8 +141,6 @@ jobs:
149141
uses: gradle/gradle-build-action@v3
150142
env:
151143
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
152-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
153-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
154144
with:
155145
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
156146
arguments: check -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
@@ -239,8 +229,6 @@ jobs:
239229
- name: List tests
240230
env:
241231
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
242-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
243-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
244232
uses: gradle/gradle-build-action@v3
245233
with:
246234
# "check" is needed to activate all tests for listing purposes
@@ -259,8 +247,6 @@ jobs:
259247
- name: Test
260248
env:
261249
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
262-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
263-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
264250
uses: gradle/gradle-build-action@v3
265251
with:
266252
# spotless is checked separately since it's a common source of failure
@@ -345,16 +331,12 @@ jobs:
345331
- name: Build
346332
env:
347333
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
348-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
349-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
350334
# running suite "none" compiles everything needed by smoke tests without executing any tests
351335
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
352336

353337
- name: Test
354338
env:
355339
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
356-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
357-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
358340
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
359341

360342
- name: Upload jvm crash dump files if any

‎.github/workflows/build-daily.yml

-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ jobs:
1111
uses: ./.github/workflows/build-common.yml
1212
secrets:
1313
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
14-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
15-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
1614

1715
test-latest-deps:
1816
uses: ./.github/workflows/reusable-test-latest-deps.yml
1917
secrets:
2018
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
21-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
22-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
2319

2420
muzzle:
2521
uses: ./.github/workflows/reusable-muzzle.yml

‎.github/workflows/build.yml

-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
uses: ./.github/workflows/build-common.yml
1313
secrets:
1414
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
15-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
16-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
1715

1816
test-latest-deps:
1917
# release branches are excluded
@@ -23,8 +21,6 @@ jobs:
2321
uses: ./.github/workflows/reusable-test-latest-deps.yml
2422
secrets:
2523
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
26-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
27-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
2824

2925
muzzle:
3026
# release branches are excluded

‎.github/workflows/reusable-test-indy.yml

-8
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ on:
1212
secrets:
1313
GRADLE_ENTERPRISE_ACCESS_KEY:
1414
required: false
15-
GE_CACHE_USERNAME:
16-
required: false
17-
GE_CACHE_PASSWORD:
18-
required: false
1915

2016
jobs:
2117
test-indy:
@@ -62,8 +58,6 @@ jobs:
6258
- name: List tests
6359
env:
6460
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
65-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
66-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
6761
uses: gradle/gradle-build-action@v3
6862
with:
6963
arguments: >
@@ -80,8 +74,6 @@ jobs:
8074
uses: gradle/gradle-build-action@v3
8175
env:
8276
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
83-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
84-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
8577
with:
8678
arguments: >
8779
${{ env.test-tasks }}

‎.github/workflows/reusable-test-latest-deps.yml

-8
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ on:
1212
secrets:
1313
GRADLE_ENTERPRISE_ACCESS_KEY:
1414
required: false
15-
GE_CACHE_USERNAME:
16-
required: false
17-
GE_CACHE_PASSWORD:
18-
required: false
1915

2016
jobs:
2117
test-latest-deps:
@@ -55,8 +51,6 @@ jobs:
5551
- name: List tests
5652
env:
5753
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
58-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
59-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
6054
uses: gradle/gradle-build-action@v3
6155
with:
6256
arguments: >
@@ -74,8 +68,6 @@ jobs:
7468
uses: gradle/gradle-build-action@v3
7569
env:
7670
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
77-
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
78-
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
7971
with:
8072
arguments: >
8173
${{ env.test-tasks }}

‎settings.gradle.kts

+3-10
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,10 @@ if (useScansGradleCom) {
7171
}
7272
}
7373
}
74-
}
7574

76-
val geCacheUsername = System.getenv("GE_CACHE_USERNAME") ?: ""
77-
val geCachePassword = System.getenv("GE_CACHE_PASSWORD") ?: ""
78-
buildCache {
79-
remote<HttpBuildCache> {
80-
url = uri("$gradleEnterpriseServer/cache/")
81-
isPush = isCI && geCacheUsername.isNotEmpty()
82-
credentials {
83-
username = geCacheUsername
84-
password = geCachePassword
75+
buildCache {
76+
remote(gradleEnterprise.buildCache) {
77+
isPush = isCI && geAccessKey.isNotEmpty()
8578
}
8679
}
8780
}

0 commit comments

Comments
 (0)
Please sign in to comment.