Skip to content

Commit 2e74a4d

Browse files
committed
Upgrade to gradle-enterprise-conventions 0.0.17
Closes gh-32725
1 parent 0c307b5 commit 2e74a4d

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

Diff for: .github/workflows/build-and-deploy-snapshot.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ jobs:
3535
env:
3636
CI: 'true'
3737
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
39-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
40-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
4139
run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository
4240
- name: Deploy
4341
uses: spring-io/[email protected]

Diff for: .github/workflows/ci.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ jobs:
6868
env:
6969
CI: 'true'
7070
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
71-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
72-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
73-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
71+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
7472
run: ./gradlew check
7573
- name: Send notification
7674
uses: ./.github/actions/send-notification
@@ -79,4 +77,4 @@ jobs:
7977
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
8078
status: ${{ job.status }}
8179
build-scan-url: ${{ steps.build.outputs.build-scan-url }}
82-
run-name: ${{ format('{0} | {1} | Java {2}', github.ref_name, matrix.os.name, matrix.java.version) }}
80+
run-name: ${{ format('{0} | {1} | Java {2}', github.ref_name, matrix.os.name, matrix.java.version) }}

Diff for: ci/pipeline.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ anchors:
55
password: ((github-ci-release-token))
66
branch: ((branch))
77
gradle-enterprise-task-params: &gradle-enterprise-task-params
8-
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
9-
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
10-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
8+
DEVELOCITY_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
119
sonatype-task-params: &sonatype-task-params
1210
SONATYPE_USERNAME: ((sonatype-username))
1311
SONATYPE_PASSWORD: ((sonatype-password))

Diff for: settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pluginManagement {
77
}
88

99
plugins {
10-
id "com.gradle.enterprise" version "3.12.1"
11-
id "io.spring.ge.conventions" version "0.0.13"
10+
id "com.gradle.develocity" version "3.17.2"
11+
id "io.spring.ge.conventions" version "0.0.17"
1212
}
1313

1414
include "spring-aop"

0 commit comments

Comments
 (0)