Skip to content

Commit 6f0dfef

Browse files
committed
Merge branch '3.2.x'
Closes gh-40352
2 parents e8a92d3 + f763751 commit 6f0dfef

File tree

2 files changed

+61
-47
lines changed

2 files changed

+61
-47
lines changed

.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -74,51 +74,10 @@ jobs:
7474
run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
7575
outputs:
7676
version: ${{ steps.read-version.outputs.version }}
77-
run-verification-tests:
78-
name: Verify ${{ needs.build-and-deploy-snapshot.outputs.version }}
79-
runs-on: ubuntu-latest
77+
verify:
78+
name: Verify
8079
needs: build-and-deploy-snapshot
81-
steps:
82-
- name: Check Out Release Verification Tests
83-
uses: actions/checkout@v4
84-
with:
85-
repository: spring-projects/spring-boot-release-verification
86-
ref: 'main'
87-
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
88-
- name: Check Out Send Notification Action
89-
uses: actions/checkout@v4
90-
with:
91-
path: spring-boot
92-
sparse-checkout: .github/actions/send-notification
93-
- name: Set Up Java
94-
uses: actions/setup-java@v4
95-
with:
96-
distribution: 'liberica'
97-
java-version: 17
98-
- name: Set Up Gradle
99-
uses: gradle/actions/setup-gradle@1168cd3d07c1876a65e1724114de42ccbdfa7b78
100-
with:
101-
cache-read-only: false
102-
- name: Configure Gradle Properties
103-
shell: bash
104-
run: |
105-
mkdir -p $HOME/.gradle
106-
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
107-
- name: Run Release Verification Tests
108-
env:
109-
RVT_VERSION: ${{ needs.build-and-deploy-snapshot.outputs.version }}
110-
RVT_RELEASE_TYPE: oss
111-
run: ./gradlew spring-boot-release-verification-tests:test
112-
- name: Upload Build Reports on Failure
113-
uses: actions/upload-artifact@v4
114-
if: failure()
115-
with:
116-
name: build-reports
117-
path: '**/build/reports/'
118-
- name: Send Notification
119-
uses: ./spring-boot/.github/actions/send-notification
120-
if: always()
121-
with:
122-
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
123-
status: ${{ job.status }}
124-
run-name: ${{ format('{0} | Verification | {1}', github.ref_name, needs.build-and-deploy-snapshot.outputs.version) }}
80+
uses: .github/workflows/verify.yml
81+
secrets: inherit
82+
with:
83+
version: ${{ needs.build-and-deploy-snapshot.outputs.version }}

.github/workflows/verify.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Verify
2+
on:
3+
workflow-call:
4+
inputs:
5+
version:
6+
required: true
7+
type: string
8+
jobs:
9+
verify:
10+
name: Verify
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Check Out Release Verification Tests
14+
uses: actions/checkout@v4
15+
with:
16+
repository: spring-projects/spring-boot-release-verification
17+
ref: 'main'
18+
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
19+
- name: Check Out Send Notification Action
20+
uses: actions/checkout@v4
21+
with:
22+
path: spring-boot
23+
sparse-checkout: .github/actions/send-notification
24+
- name: Set Up Java
25+
uses: actions/setup-java@v4
26+
with:
27+
distribution: 'liberica'
28+
java-version: 17
29+
- name: Set Up Gradle
30+
uses: gradle/actions/setup-gradle@1168cd3d07c1876a65e1724114de42ccbdfa7b78 #v3.2.1
31+
with:
32+
cache-read-only: false
33+
- name: Configure Gradle Properties
34+
shell: bash
35+
run: |
36+
mkdir -p $HOME/.gradle
37+
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
38+
- name: Run Release Verification Tests
39+
env:
40+
RVT_VERSION: ${{ inputs.version }}
41+
RVT_RELEASE_TYPE: oss
42+
run: ./gradlew spring-boot-release-verification-tests:test
43+
- name: Upload Build Reports on Failure
44+
uses: actions/upload-artifact@v4
45+
if: failure()
46+
with:
47+
name: build-reports
48+
path: '**/build/reports/'
49+
- name: Send Notification
50+
uses: ./spring-boot/.github/actions/send-notification
51+
if: always()
52+
with:
53+
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
54+
status: ${{ job.status }}
55+
run-name: ${{ format('{0} | Verification | {1}', github.ref_name, inputs.version) }}

0 commit comments

Comments
 (0)