Skip to content

Commit 5e30b4c

Browse files
Merge branch '3.0.x' into 3.1.x
2 parents 09ec2cb + 46ed262 commit 5e30b4c

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,19 @@ jobs:
2525
jdk: [17]
2626
fail-fast: false
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929
- name: Set up JDK ${{ matrix.jdk }}
30-
uses: actions/setup-java@v1
30+
uses: actions/setup-java@v3
3131
with:
3232
java-version: ${{ matrix.jdk }}
33+
distribution: 'temurin'
34+
cache: 'gradle'
3335
- name: Setup gradle user name
3436
run: |
3537
mkdir -p ~/.gradle
3638
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
3739
- name: Cache Gradle packages
38-
uses: actions/cache@v2
40+
uses: actions/cache@v3
3941
with:
4042
path: ~/.gradle/caches
4143
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -51,11 +53,13 @@ jobs:
5153
runs-on: ubuntu-latest
5254
if: github.repository == 'spring-projects/spring-session'
5355
steps:
54-
- uses: actions/checkout@v2
56+
- uses: actions/checkout@v3
5557
- name: Set up JDK
56-
uses: actions/setup-java@v1
58+
uses: actions/setup-java@v3
5759
with:
5860
java-version: '17'
61+
distribution: 'temurin'
62+
cache: 'gradle'
5963
- name: Setup gradle user name
6064
run: |
6165
mkdir -p ~/.gradle
@@ -79,11 +83,13 @@ jobs:
7983
runs-on: ubuntu-latest
8084
if: github.repository == 'spring-projects/spring-session'
8185
steps:
82-
- uses: actions/checkout@v2
86+
- uses: actions/checkout@v3
8387
- name: Set up JDK
84-
uses: actions/setup-java@v1
88+
uses: actions/setup-java@v3
8589
with:
8690
java-version: '17'
91+
distribution: 'temurin'
92+
cache: 'gradle'
8793
- name: Setup gradle user name
8894
run: |
8995
mkdir -p ~/.gradle

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ jobs:
66
name: "Validation"
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v3
1010
- uses: gradle/wrapper-validation-action@v1

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ jobs:
1212
jdk: [17]
1313
fail-fast: false
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Set up JDK ${{ matrix.jdk }}
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v3
1818
with:
1919
java-version: ${{ matrix.jdk }}
20+
distribution: 'temurin'
21+
cache: 'gradle'
2022
- name: Cache Gradle packages
21-
uses: actions/cache@v2
23+
uses: actions/cache@v3
2224
with:
2325
path: ~/.gradle/caches
2426
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

0 commit comments

Comments
 (0)