Skip to content

Commit 5a72b65

Browse files
sjohnrsjohnr
committed
Remove deprecated secrets and switch to DEVELOCITY_ACCESS_KEY
Closes gh-58 [skip ci]
1 parent 8a9ce74 commit 5a72b65

9 files changed

+9
-90
lines changed

‎.github/workflows/build-pull-request.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,11 @@ on:
1414
default: 'temurin'
1515
type: string
1616
secrets:
17-
GRADLE_ENTERPRISE_CACHE_USER:
18-
required: false
19-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
20-
required: false
21-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
22-
required: false
2317
DEVELOCITY_ACCESS_KEY:
2418
required: false
2519

2620
env:
27-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
28-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
29-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
30-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
21+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3122

3223
jobs:
3324
build:

‎.github/workflows/build.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,13 @@ on:
2727
required: false
2828
ARTIFACTORY_PASSWORD:
2929
required: false
30-
GRADLE_ENTERPRISE_CACHE_USER:
31-
required: false
32-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
33-
required: false
34-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
35-
required: false
3630
DEVELOCITY_ACCESS_KEY:
3731
required: false
3832

3933
env:
4034
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
4135
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
42-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
43-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
44-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
45-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
36+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4637

4738
jobs:
4839
build:

‎.github/workflows/deploy-artifacts.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ on:
1515
description: The project version extracted from the current branch/tag.
1616
value: ${{ jobs.deploy-artifacts.outputs.project-version }}
1717
secrets:
18-
GRADLE_ENTERPRISE_CACHE_USER:
19-
required: false
20-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
21-
required: false
22-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
23-
required: false
2418
DEVELOCITY_ACCESS_KEY:
2519
required: false
2620
ARTIFACTORY_USERNAME:
@@ -37,10 +31,7 @@ on:
3731
required: false
3832

3933
env:
40-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
41-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
42-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
43-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
34+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4435
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
4536
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
4637
OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}

‎.github/workflows/deploy-docs.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ on:
1212
description: Whether docs were actually deployed.
1313
value: ${{ jobs.deploy-docs.outputs.docs-deployed }}
1414
secrets:
15-
GRADLE_ENTERPRISE_CACHE_USER:
16-
required: false
17-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
18-
required: false
19-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
20-
required: false
2115
DEVELOCITY_ACCESS_KEY:
2216
required: false
2317
DOCS_USERNAME:
@@ -28,10 +22,7 @@ on:
2822
required: false
2923

3024
env:
31-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
32-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
33-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
34-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
25+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3526
DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
3627
DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
3728
DOCS_HOST: ${{ secrets.DOCS_HOST }}

‎.github/workflows/deploy-schema.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ on:
1212
description: Whether schema files were actually deployed.
1313
value: ${{ jobs.deploy-schema.outputs.docs-deployed }}
1414
secrets:
15-
GRADLE_ENTERPRISE_CACHE_USER:
16-
required: false
17-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
18-
required: false
19-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
20-
required: false
2115
DEVELOCITY_ACCESS_KEY:
2216
required: false
2317
DOCS_USERNAME:
@@ -28,10 +22,7 @@ on:
2822
required: false
2923

3024
env:
31-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
32-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
33-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
34-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
25+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3526
DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
3627
DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
3728
DOCS_HOST: ${{ secrets.DOCS_HOST }}

‎.github/workflows/perform-release.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ on:
2929
required: true
3030
type: string
3131
secrets:
32-
GRADLE_ENTERPRISE_CACHE_USER:
33-
required: false
34-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
35-
required: false
36-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
37-
required: false
3832
DEVELOCITY_ACCESS_KEY:
3933
required: false
4034
GH_ACTIONS_REPO_TOKEN:
@@ -43,10 +37,7 @@ on:
4337
required: true
4438

4539
env:
46-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
47-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
48-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
49-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
40+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5041

5142
jobs:
5243
perform-release:

‎.github/workflows/publish-plugins.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ on:
1919
description: The project version extracted from the current branch/tag.
2020
value: ${{ jobs.publish-plugins.outputs.project-version }}
2121
secrets:
22-
GRADLE_ENTERPRISE_CACHE_USER:
23-
required: false
24-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
25-
required: false
26-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
27-
required: false
2822
DEVELOCITY_ACCESS_KEY:
2923
required: false
3024
GRADLE_PUBLISH_KEY_CREDENTIAL:
@@ -37,10 +31,7 @@ on:
3731
required: false
3832

3933
env:
40-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
41-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
42-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
43-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
34+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4435
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY_CREDENTIAL }}
4536
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET_CREDENTIAL }}
4637

‎.github/workflows/test.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,11 @@ on:
1919
default: ''
2020
type: string
2121
secrets:
22-
GRADLE_ENTERPRISE_CACHE_USER:
23-
required: false
24-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
25-
required: false
26-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
27-
required: false
2822
DEVELOCITY_ACCESS_KEY:
2923
required: false
3024

3125
env:
32-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
33-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
34-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
35-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
26+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3627

3728
jobs:
3829
test:

‎.github/workflows/update-scheduled-release-version.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ name: Update Scheduled Release Version
33
on:
44
workflow_call:
55
secrets:
6-
GRADLE_ENTERPRISE_CACHE_USER:
7-
required: false
8-
GRADLE_ENTERPRISE_CACHE_PASSWORD:
9-
required: false
10-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY:
11-
required: false
126
DEVELOCITY_ACCESS_KEY:
137
required: false
148
GH_ACTIONS_REPO_TOKEN:
@@ -17,10 +11,7 @@ on:
1711
required: true
1812

1913
env:
20-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
21-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
22-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
23-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
14+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2415
TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
2516

2617
jobs:

0 commit comments

Comments
 (0)