Skip to content

Commit 7cf587a

Browse files
tylerbertrandfokion
authored andcommitted
Use Develocity build cache configuration and access key authentication (testcontainers#8964)
1 parent bd4cb97 commit 7cf587a

File tree

4 files changed

+7
-23
lines changed

4 files changed

+7
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ permissions:
4343
env:
4444
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
4545
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
46-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
47-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
46+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4847

4948
jobs:
5049
core:

examples/settings.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,9 @@ buildCache {
4343
local {
4444
enabled = !isCI
4545
}
46-
remote(HttpBuildCache) {
47-
push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
46+
remote(develocity.buildCache) {
47+
push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
4848
enabled = true
49-
url = 'https://ge.testcontainers.org/cache/'
50-
credentials {
51-
username = 'ci'
52-
password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
53-
}
5449
}
5550
}
5651

settings.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,9 @@ buildCache {
4040
local {
4141
enabled = !isCI
4242
}
43-
remote(HttpBuildCache) {
44-
push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
43+
remote(develocity.buildCache) {
44+
push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
4545
enabled = true
46-
url = 'https://ge.testcontainers.org/cache/'
47-
credentials {
48-
username = 'ci'
49-
password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
50-
}
5146
}
5247
}
5348

smoke-test/settings.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@ buildCache {
2727
local {
2828
enabled = !isCI
2929
}
30-
remote(HttpBuildCache) {
31-
push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
30+
remote(develocity.buildCache) {
31+
push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
3232
enabled = true
33-
url = 'https://ge.testcontainers.org/cache/'
34-
credentials {
35-
username = 'ci'
36-
password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
37-
}
3833
}
3934
}
4035

0 commit comments

Comments
 (0)