Skip to content

Commit 5cdcb08

Browse files
authored
Merge pull request #13806 from grails/matix-java-os-liberica
matrix the build on java 17, 21 and 23 w/ ubuntu, windows and macOS using liberica
2 parents ee1b5aa + 7471e9c commit 5cdcb08

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

.github/workflows/codeql.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ jobs:
3939
steps:
4040
- name: Checkout repository
4141
uses: actions/checkout@v4
42-
42+
- name: "☕️ Setup JDK"
43+
uses: actions/setup-java@v4
44+
with:
45+
distribution: liberica
46+
java-version: 17
4347
# Initializes the CodeQL tools for scanning.
4448
- name: Initialize CodeQL
4549
uses: github/codeql-action/init@v3

.github/workflows/gradle.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ jobs:
1313
build:
1414
permissions:
1515
contents: read # to fetch code (actions/checkout)
16-
runs-on: ubuntu-latest
1716
strategy:
1817
matrix:
19-
java: [17]
18+
java: [17, 21, 23]
19+
os: [ubuntu-latest, windows-latest, macos-latest]
20+
runs-on: ${{ matrix.os }}
2021
steps:
2122
- name: "📥 Checkout repository"
2223
uses: actions/checkout@v4
2324
- name: "☕️ Setup JDK"
2425
uses: actions/setup-java@v4
2526
with:
26-
distribution: temurin
27+
distribution: liberica
2728
java-version: ${{ matrix.java }}
2829
- name: "🐘 Setup Gradle"
2930
uses: gradle/actions/setup-gradle@v4
@@ -47,7 +48,7 @@ jobs:
4748
- name: "☕️ Setup JDK"
4849
uses: actions/setup-java@v4
4950
with:
50-
distribution: temurin
51+
distribution: liberica
5152
java-version: 17
5253
- name: "🐘 Setup Gradle"
5354
uses: gradle/actions/setup-gradle@v4

.github/workflows/groovy-joint-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: "☕️ Setup JDK"
1919
uses: actions/setup-java@v4
2020
with:
21-
distribution: temurin
21+
distribution: liberica
2222
java-version: 17
2323
- name: "🗄️ Cache local Maven repository"
2424
uses: actions/cache@v4
@@ -121,7 +121,7 @@ jobs:
121121
- name: "☕️ Setup JDK"
122122
uses: actions/setup-java@v4
123123
with:
124-
distribution: temurin
124+
distribution: liberica
125125
java-version: 17
126126
- name: "🐘 Setup Gradle"
127127
uses: gradle/actions/setup-gradle@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: "☕️ Setup JDK"
2222
uses: actions/setup-java@v4
2323
with:
24-
distribution: temurin
24+
distribution: liberica
2525
java-version: 17
2626
- name: "🐘 Setup Gradle"
2727
uses: gradle/actions/setup-gradle@v4
@@ -97,7 +97,7 @@ jobs:
9797
- name: "☕️ Setup JDK"
9898
uses: actions/setup-java@v4
9999
with:
100-
distribution: temurin
100+
distribution: liberica
101101
java-version: 17
102102
- name: "🐘 Setup Gradle"
103103
uses: gradle/actions/setup-gradle@v4

.github/workflows/retry-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: "☕️ Setup JDK"
2828
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
2929
with:
30-
distribution: temurin
30+
distribution: liberica
3131
java-version: 17
3232
- name: "🐘 Setup Gradle"
3333
uses: gradle/actions/setup-gradle@v4

.github/workflows/sdkman.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: "☕️ Setup JDK"
2020
uses: actions/setup-java@v4
2121
with:
22-
distribution: temurin
22+
distribution: liberica
2323
java-version: 17
2424
- name: "🐘 Setup Gradle"
2525
uses: gradle/actions/setup-gradle@v4

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,9 @@ subprojects { subproject ->
464464
}
465465
}
466466

467-
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
467+
compileJava {
468+
options.release = 17
469+
}
468470

469471
if (!isTestSuite) {
470472
tasks.register('installToHomeDist', Copy) {

0 commit comments

Comments
 (0)