Skip to content

Commit 6d8a421

Browse files
committed
Update CI to use Java 23 GA
Closes gh-42345
1 parent ef5bc91 commit 6d8a421

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/actions/build/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ inputs:
1313
required: false
1414
default: 'false'
1515
description: 'Whether a Java toolchain should be used'
16+
java-distribution:
17+
required: false
18+
default: 'liberica'
19+
description: 'The distribution of Java to use'
1620
publish:
1721
required: false
1822
default: 'false'
@@ -37,6 +41,7 @@ runs:
3741
java-version: ${{ inputs.java-version }}
3842
java-early-access: ${{ inputs.java-early-access }}
3943
java-toolchain: ${{ inputs.java-toolchain }}
44+
java-distribution: ${{ inputs.java-distribution }}
4045
- name: Build
4146
id: build
4247
if: ${{ inputs.publish == 'false' }}

.github/actions/prepare-gradle-build/action.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ inputs:
88
java-early-access:
99
required: false
1010
default: 'false'
11-
description: 'Whether the Java version is in early access'
11+
description: 'Whether the Java version is in early access. When true, forces java-distribution to temurin'
1212
java-toolchain:
1313
required: false
1414
default: 'false'
1515
description: 'Whether a Java toolchain should be used'
16+
java-distribution:
17+
required: false
18+
default: 'liberica'
19+
description: 'The distribution of Java to use'
1620
develocity-access-key:
1721
required: false
1822
description: 'The access key for authentication with ge.spring.io'
@@ -27,7 +31,7 @@ runs:
2731
- name: Set Up Java
2832
uses: actions/setup-java@v4
2933
with:
30-
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
34+
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || inputs.java-distribution }}
3135
java-version: |
3236
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3337
${{ inputs.java-toolchain == 'true' && '17' || '' }}

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- version: 22
2727
toolchain: true
2828
- version: 23
29-
early-access: true
29+
distribution: oracle
3030
toolchain: true
3131
exclude:
3232
- os:
@@ -49,6 +49,7 @@ jobs:
4949
java-version: ${{ matrix.java.version }}
5050
java-early-access: ${{ matrix.java.early-access || 'false' }}
5151
java-toolchain: ${{ matrix.java.toolchain }}
52+
java-distribution: ${{ matrix.java.distribution }}
5253
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
5354
- name: Send Notification
5455
uses: ./.github/actions/send-notification

0 commit comments

Comments
 (0)