Skip to content

Commit 7dec251

Browse files
authored
Always test on the latest Java (#1819)
1 parent 4d6d87f commit 7dec251

File tree

4 files changed

+27
-16
lines changed

4 files changed

+27
-16
lines changed

.github/renovate.json5

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,25 @@
2222
"com.gradle.develocity:com.gradle.develocity.gradle.plugin",
2323
],
2424
},
25+
],
26+
ignorePresets: [
27+
// Ensure we get the latest version and are not pinned to old versions.
28+
'workarounds:javaLTSVersions',
29+
],
30+
customManagers: [
31+
// Update .java-version file with the latest JDK version.
32+
{
33+
customType: 'regex',
34+
fileMatch: [
35+
'\\.java-version$',
36+
],
37+
matchStrings: [
38+
'(?<currentValue>.*)\\n',
39+
],
40+
datasourceTemplate: 'java-version',
41+
depNameTemplate: 'java',
42+
// Only write the major version.
43+
extractVersionTemplate: '^(?<version>\\d+)',
44+
},
2545
]
2646
}

.github/workflows/.java-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24

.github/workflows/build.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,19 @@ on:
99

1010
jobs:
1111
build:
12-
name: OS=${{ matrix.os }}, Java=${{ matrix.java }}, Gradle=${{ matrix.gradle }}
12+
name: OS=${{ matrix.os }}, Gradle=${{ matrix.gradle }}
1313
strategy:
1414
matrix:
15-
os: [ ubuntu-24.04-arm ]
16-
# Always test on the latest version and some LTS.
17-
java: [ 17, 24 ]
15+
os: [ ubuntu-24.04-arm, windows-latest ]
1816
# Test on the minimum Gradle version and the latest.
1917
gradle: [ 9.0.0, current ]
20-
include:
21-
# We just test one JDK version on Windows.
22-
- os: windows-11-arm
23-
gradle: 9.0.0
24-
java: 21
25-
- os: windows-11-arm
26-
gradle: current
27-
java: 21
2818
runs-on: ${{ matrix.os }}
2919
steps:
3020
- uses: actions/checkout@v5
3121
- uses: actions/setup-java@v5
3222
with:
3323
distribution: 'zulu'
34-
java-version: ${{ matrix.java }}
24+
java-version-file: .github/workflows/.java-version
3525
- uses: gradle/actions/setup-gradle@v5
3626
- run: ./gradlew build "-PtestGradleVersion=${{ matrix.gradle }}" --stacktrace -x lint
3727

@@ -43,7 +33,7 @@ jobs:
4333
- uses: actions/setup-java@v5
4434
with:
4535
distribution: 'zulu'
46-
java-version: 21
36+
java-version-file: .github/workflows/.java-version
4737
- uses: gradle/actions/setup-gradle@v5
4838
- run: ./gradlew lint
4939

@@ -73,7 +63,7 @@ jobs:
7363
- uses: actions/setup-java@v5
7464
with:
7565
distribution: 'zulu'
76-
java-version: 21
66+
java-version-file: .github/workflows/.java-version
7767
- uses: gradle/actions/setup-gradle@v5
7868
with:
7969
cache-read-only: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v5
1919
with:
2020
distribution: 'zulu'
21-
java-version: 21
21+
java-version-file: .github/workflows/.java-version
2222
- uses: gradle/actions/setup-gradle@v5
2323
with:
2424
cache-read-only: true

0 commit comments

Comments
 (0)