Skip to content

Commit e756a1d

Browse files
author
Steve Riesenberg
committed
Use Spring Gradle Build Action
Closes gh-11630
1 parent 81fae2d commit e756a1d

File tree

5 files changed

+45
-123
lines changed

5 files changed

+45
-123
lines changed

‎.github/workflows/antora-generate.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@ jobs:
1919
steps:
2020
- name: Checkout Source
2121
uses: actions/checkout@v2
22-
- name: Set up JDK
23-
uses: actions/setup-java@v1
22+
- name: Set up gradle
23+
uses: spring-io/spring-gradle-build-action@v1
2424
with:
2525
java-version: '11'
26-
- name: Setup Gradle
27-
uses: gradle/gradle-build-action@v2
28-
env:
29-
GRADLE_USER_HOME: ~/.gradle
26+
distribution: 'adopt'
3027
- name: Generate antora.yml
3128
run: ./gradlew :spring-security-docs:generateAntora
3229
- name: Extract Branch Name

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

Lines changed: 28 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
name: Determine if should continue
3737
if: env.RUN_JOBS == 'true'
3838
run: |
39+
# Run jobs if in upstream repository
3940
echo "::set-output name=runjobs::true"
4041
# Extract version from gradle.properties
4142
version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
@@ -50,18 +51,11 @@ jobs:
5051
if: needs.prerequisites.outputs.runjobs
5152
steps:
5253
- uses: actions/checkout@v2
53-
- name: Set up JDK 11
54-
uses: actions/setup-java@v1
54+
- name: Set up gradle
55+
uses: spring-io/spring-gradle-build-action@v1
5556
with:
5657
java-version: '11'
57-
- name: Setup gradle user name
58-
run: |
59-
mkdir -p ~/.gradle
60-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
61-
- name: Setup Gradle
62-
uses: gradle/gradle-build-action@v2
63-
env:
64-
GRADLE_USER_HOME: ~/.gradle
58+
distribution: 'adopt'
6559
- name: Build with Gradle
6660
env:
6761
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
@@ -75,18 +69,11 @@ jobs:
7569
if: needs.prerequisites.outputs.runjobs
7670
steps:
7771
- uses: actions/checkout@v2
78-
- name: Set up JDK
79-
uses: actions/setup-java@v1
72+
- name: Set up gradle
73+
uses: spring-io/spring-gradle-build-action@v1
8074
with:
8175
java-version: '11'
82-
- name: Setup gradle user name
83-
run: |
84-
mkdir -p ~/.gradle
85-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
86-
- name: Setup Gradle
87-
uses: gradle/gradle-build-action@v2
88-
env:
89-
GRADLE_USER_HOME: ~/.gradle
76+
distribution: 'adopt'
9077
- name: Snapshot Tests
9178
run: |
9279
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
@@ -100,18 +87,11 @@ jobs:
10087
if: needs.prerequisites.outputs.runjobs
10188
steps:
10289
- uses: actions/checkout@v2
103-
- name: Set up JDK
104-
uses: actions/setup-java@v1
90+
- name: Set up gradle
91+
uses: spring-io/spring-gradle-build-action@v1
10592
with:
10693
java-version: '11'
107-
- name: Setup gradle user name
108-
run: |
109-
mkdir -p ~/.gradle
110-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
111-
- name: Setup Gradle
112-
uses: gradle/gradle-build-action@v2
113-
env:
114-
GRADLE_USER_HOME: ~/.gradle
94+
distribution: 'adopt'
11595
- name: Check samples project
11696
env:
11797
LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
@@ -129,18 +109,11 @@ jobs:
129109
if: needs.prerequisites.outputs.runjobs
130110
steps:
131111
- uses: actions/checkout@v2
132-
- name: Set up JDK
133-
uses: actions/setup-java@v1
112+
- name: Set up gradle
113+
uses: spring-io/spring-gradle-build-action@v1
134114
with:
135115
java-version: '11'
136-
- name: Setup gradle user name
137-
run: |
138-
mkdir -p ~/.gradle
139-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
140-
- name: Setup Gradle
141-
uses: gradle/gradle-build-action@v2
142-
env:
143-
GRADLE_USER_HOME: ~/.gradle
116+
distribution: 'adopt'
144117
- name: Check for package tangles
145118
run: |
146119
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
@@ -153,18 +126,11 @@ jobs:
153126
runs-on: ubuntu-latest
154127
steps:
155128
- uses: actions/checkout@v2
156-
- name: Set up JDK
157-
uses: actions/setup-java@v1
129+
- name: Set up gradle
130+
uses: spring-io/spring-gradle-build-action@v1
158131
with:
159132
java-version: '11'
160-
- name: Setup gradle user name
161-
run: |
162-
mkdir -p ~/.gradle
163-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
164-
- name: Setup Gradle
165-
uses: gradle/gradle-build-action@v2
166-
env:
167-
GRADLE_USER_HOME: ~/.gradle
133+
distribution: 'adopt'
168134
- name: Deploy artifacts
169135
run: |
170136
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
@@ -184,18 +150,11 @@ jobs:
184150
runs-on: ubuntu-latest
185151
steps:
186152
- uses: actions/checkout@v2
187-
- name: Set up JDK
188-
uses: actions/setup-java@v1
153+
- name: Set up gradle
154+
uses: spring-io/spring-gradle-build-action@v1
189155
with:
190156
java-version: '11'
191-
- name: Setup gradle user name
192-
run: |
193-
mkdir -p ~/.gradle
194-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
195-
- name: Setup Gradle
196-
uses: gradle/gradle-build-action@v2
197-
env:
198-
GRADLE_USER_HOME: ~/.gradle
157+
distribution: 'adopt'
199158
- name: Deploy Docs
200159
run: |
201160
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
@@ -212,18 +171,11 @@ jobs:
212171
runs-on: ubuntu-latest
213172
steps:
214173
- uses: actions/checkout@v2
215-
- name: Set up JDK
216-
uses: actions/setup-java@v1
174+
- name: Set up gradle
175+
uses: spring-io/spring-gradle-build-action@v1
217176
with:
218177
java-version: '11'
219-
- name: Setup gradle user name
220-
run: |
221-
mkdir -p ~/.gradle
222-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
223-
- name: Setup Gradle
224-
uses: gradle/gradle-build-action@v2
225-
env:
226-
GRADLE_USER_HOME: ~/.gradle
178+
distribution: 'adopt'
227179
- name: Deploy Schema
228180
run: |
229181
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
@@ -251,18 +203,11 @@ jobs:
251203
- uses: actions/checkout@v2
252204
with:
253205
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
254-
- name: Set up JDK
255-
uses: actions/setup-java@v1
206+
- name: Set up gradle
207+
uses: spring-io/spring-gradle-build-action@v1
256208
with:
257209
java-version: '11'
258-
- name: Setup gradle user name
259-
run: |
260-
mkdir -p ~/.gradle
261-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
262-
- name: Setup Gradle
263-
uses: gradle/gradle-build-action@v2
264-
env:
265-
GRADLE_USER_HOME: ~/.gradle
210+
distribution: 'adopt'
266211
- name: Wait for Artifactory Artifacts
267212
if: ${{ contains(needs.prerequisites.outputs.project_version, '-RC') || contains(needs.prerequisites.outputs.project_version, '-M') }}
268213
run: |
@@ -338,15 +283,16 @@ jobs:
338283
VERSION: ${{ needs.prerequisites.outputs.project_version }}
339284
steps:
340285
- uses: actions/checkout@v2
341-
- uses: spring-io/spring-gradle-build-action@v1
286+
- name: Set up gradle
287+
uses: spring-io/spring-gradle-build-action@v1
342288
with:
343289
java-version: '11'
344290
distribution: 'adopt'
345291
- name: Schedule next release (if not already scheduled)
346292
run: ./gradlew scheduleNextRelease -PnextVersion=$VERSION -PgitHubAccessToken=$TOKEN
347293
notify_result:
348294
name: Check for failures
349-
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles, deploy_artifacts, deploy_docs, deploy_schema, perform_release, perform_post_release]
295+
needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles, deploy_artifacts, deploy_docs, deploy_schema, perform_release, perform_post_release]
350296
if: failure()
351297
runs-on: ubuntu-latest
352298
permissions:

‎.github/workflows/deploy-reference.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,17 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Set up JDK 11
20-
uses: actions/setup-java@v2
19+
- name: Set up gradle
20+
uses: spring-io/spring-gradle-build-action@v1
2121
with:
2222
java-version: '11'
2323
distribution: 'adopt'
24-
- name: Validate Gradle wrapper
25-
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
26-
- name: Setup Gradle
27-
uses: gradle/gradle-build-action@v2
28-
env:
29-
GRADLE_USER_HOME: ~/.gradle
30-
with:
31-
# Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
32-
# Restoring these files from a GitHub Actions cache might cause problems for future builds.
33-
gradle-home-cache-excludes: |
34-
caches/modules-2/modules-2.lock
35-
caches/modules-2/gc.properties
24+
- name: Cleanup Gradle Cache
25+
# Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
26+
# Restoring these files from a GitHub Actions cache might cause problems for future builds.
27+
run: |
28+
rm -f /home/runner/.gradle/caches/modules-2/modules-2.lock
29+
rm -f /home/runner/.gradle/caches/modules-2/gc.properties
3630
- name: Build with Gradle
3731
run: ./gradlew :spring-security-docs:antora --stacktrace
3832
- name: Deploy

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ jobs:
1515
steps:
1616
- if: env.RUN_JOBS == 'true'
1717
uses: actions/checkout@v2
18-
- name: Set up JDK
19-
if: env.RUN_JOBS == 'true'
20-
uses: actions/setup-java@v1
18+
- name: Set up gradle
19+
uses: spring-io/spring-gradle-build-action@v1
2120
with:
2221
java-version: '11'
23-
- name: Setup Gradle
24-
if: env.RUN_JOBS == 'true'
25-
uses: gradle/gradle-build-action@v2
26-
with:
27-
cache-read-only: true
28-
env:
29-
GRADLE_USER_HOME: ~/.gradle
22+
distribution: 'adopt'
3023
- name: Build with Gradle
3124
if: env.RUN_JOBS == 'true'
3225
run: ./gradlew clean build --continue --scan

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,11 @@ jobs:
2626
uses: actions/checkout@v2
2727
with:
2828
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
29-
- id: setup-jdk
30-
name: Set up JDK 11
31-
uses: actions/setup-java@v1
29+
- name: Set up gradle
30+
uses: spring-io/spring-gradle-build-action@v1
3231
with:
3332
java-version: '11'
34-
- name: Setup gradle user name
35-
run: |
36-
mkdir -p ~/.gradle
37-
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
38-
- name: Setup Gradle
39-
uses: gradle/gradle-build-action@v2
40-
env:
41-
GRADLE_USER_HOME: ~/.gradle
33+
distribution: 'adopt'
4234
- id: check-release-due
4335
name: Check Release Due
4436
run: |

0 commit comments

Comments
 (0)