Skip to content

Commit 5c8311b

Browse files
sjohnrsjohnr
committed
Migrate to com.gradle.develocity plugin
Issue gh-15021
1 parent d86545d commit 5c8311b

5 files changed

+12
-60
lines changed

‎.github/workflows/continuous-integration-workflow.yml

+6-41
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ on:
1010

1111
env:
1212
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
13-
GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
14-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
15-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
13+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
1614
COMMIT_OWNER: ${{ github.event.pusher.name }}
1715
COMMIT_SHA: ${{ github.sha }}
1816
STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }}
@@ -61,10 +59,6 @@ jobs:
6159
- name: Set up gradle user name
6260
run: echo 'systemProp.user.name=spring-builds+github' >> gradle.properties
6361
- name: Build with Gradle
64-
env:
65-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
66-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
67-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
6862
run: ./gradlew clean build --continue -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"
6963
snapshot_tests:
7064
name: Test against snapshots
@@ -79,11 +73,7 @@ jobs:
7973
java-version: '11'
8074
distribution: 'adopt'
8175
- name: Snapshot Tests
82-
run: |
83-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
84-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
85-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
86-
./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PspringFrameworkVersion='5.+' -PreactorVersion='2020.0.+' -PspringDataVersion='2021.2.+' -PlocksDisabled --stacktrace
76+
run: ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PspringFrameworkVersion='5.+' -PreactorVersion='2020.0.+' -PspringDataVersion='2021.2.+' -PlocksDisabled --stacktrace
8777
check_samples:
8878
name: Check Samples project
8979
needs: [prerequisites]
@@ -102,9 +92,6 @@ jobs:
10292
SAMPLES_DIR: ../spring-security-samples
10393
VERSION: ${{ needs.prerequisites.outputs.project_version }}
10494
run: |
105-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
106-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
107-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
10895
./gradlew publishMavenJavaPublicationToLocalRepository
10996
./gradlew cloneSamples -PcloneOutputDirectory="$SAMPLES_DIR"
11097
./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$VERSION" :runAllTests
@@ -121,11 +108,7 @@ jobs:
121108
java-version: '11'
122109
distribution: 'adopt'
123110
- name: Check for package tangles
124-
run: |
125-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
126-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
127-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
128-
./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
111+
run: ./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
129112
deploy_artifacts:
130113
name: Deploy Artifacts
131114
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
@@ -138,11 +121,7 @@ jobs:
138121
java-version: '11'
139122
distribution: 'adopt'
140123
- name: Deploy artifacts
141-
run: |
142-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
143-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
144-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
145-
./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
124+
run: ./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
146125
env:
147126
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
148127
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
@@ -162,11 +141,7 @@ jobs:
162141
java-version: '11'
163142
distribution: 'adopt'
164143
- name: Deploy Docs
165-
run: |
166-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
167-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
168-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
169-
./gradlew deployDocs -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace
144+
run: ./gradlew deployDocs -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace
170145
env:
171146
DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
172147
DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
@@ -183,11 +158,7 @@ jobs:
183158
java-version: '11'
184159
distribution: 'adopt'
185160
- name: Deploy Schema
186-
run: |
187-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
188-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
189-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
190-
./gradlew deploySchema -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace --info
161+
run: ./gradlew deploySchema -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace --info
191162
env:
192163
DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
193164
DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
@@ -236,9 +207,6 @@ jobs:
236207
echo "Artifacts for $REPO@$VERSION have been released to Maven Central."
237208
- name: Create GitHub Release
238209
run: |
239-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
240-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
241-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
242210
echo "Tagging and publishing $REPO@$VERSION release on GitHub."
243211
./gradlew createGitHubRelease -PnextVersion=$VERSION -Pbranch=$BRANCH -PcreateRelease=true -PgitHubAccessToken=$TOKEN
244212
- name: Announce Release on Slack
@@ -267,9 +235,6 @@ jobs:
267235
git config user.email 'github-actions[bot]@users.noreply.github.com'
268236
- name: Update to next Snapshot Version
269237
run: |
270-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
271-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
272-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
273238
echo "Updating $REPO@$VERSION to next snapshot version."
274239
./gradlew :updateToSnapshotVersion
275240
git commit -am "Next development version"

‎.github/workflows/pr-build-workflow.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ name: PR Build
33
on: pull_request
44

55
env:
6-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
7-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
8-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
6+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
97

108
permissions:
119
contents: read

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

+1-12
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ on:
55

66
env:
77
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
8-
GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
9-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
10-
GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
8+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
119

1210
permissions:
1311
contents: read
@@ -34,18 +32,12 @@ jobs:
3432
- id: check-release-due
3533
name: Check Release Due
3634
run: |
37-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
38-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
39-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
4035
./gradlew gitHubCheckNextVersionDueToday
4136
echo "is_due_today=$(cat build/github/milestones/is-due-today)" >>$GITHUB_OUTPUT
4237
- id: check-open-issues
4338
name: Check for open issues
4439
if: steps.check-release-due.outputs.is_due_today == 'true'
4540
run: |
46-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
47-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
48-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
4941
./gradlew gitHubCheckMilestoneHasNoOpenIssues
5042
echo "is_open_issues=$(cat build/github/milestones/is-open-issues)" >>$GITHUB_OUTPUT
5143
- id: validate-release-state
@@ -58,9 +50,6 @@ jobs:
5850
name: Update version and push
5951
if: steps.check-release-due.outputs.is_due_today == 'true' && steps.check-open-issues.outputs.is_open_issues == 'false'
6052
run: |
61-
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
62-
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
63-
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
6453
git config user.name 'github-actions[bot]'
6554
git config user.email 'github-actions[bot]@users.noreply.github.com'
6655
./gradlew :updateProjectVersion

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ allprojects {
129129
}
130130
}
131131

132-
if (hasProperty('buildScan')) {
132+
develocity {
133133
buildScan {
134-
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
135-
termsOfServiceAgree = 'yes'
134+
termsOfUseUrl = 'https://gradle.com/help/legal-terms-of-use'
135+
termsOfUseAgree = 'yes'
136136
}
137137
}
138138

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
}
66

77
plugins {
8-
id "com.gradle.enterprise" version "3.17.2"
8+
id "com.gradle.develocity" version "3.17.2"
99
id "io.spring.ge.conventions" version "0.0.16"
1010
}
1111

0 commit comments

Comments
 (0)