Skip to content

Commit 59f216c

Browse files
authored
Install GA releases using proper distributions rather than jdk.java.net
1 parent 8c29bda commit 59f216c

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

.github/workflows/cross-version.yml

+15-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,17 @@ jobs:
2121
matrix:
2222
jdk:
2323
- version: 22
24+
type: ga
25+
distribution: temurin
2426
- version: 23
27+
type: ga
28+
distribution: oracle
2529
- version: 24
30+
type: ea
2631
- version: 24
32+
type: ea
2733
release: leyden
28-
name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || 'ea' }})"
34+
name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
2935
runs-on: ubuntu-latest
3036
steps:
3137
- name: Check out repository
@@ -35,11 +41,19 @@ jobs:
3541
- name: Set up Test JDK
3642
uses: ./.github/actions/setup-test-jdk
3743
- name: "Set up JDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || 'ea' }})"
44+
if: matrix.jdk.type == 'ea'
3845
uses: oracle-actions/setup-java@2e744f723b003fdd759727d0ff654c8717024845 # v1.4.0
3946
with:
4047
website: jdk.java.net
4148
release: ${{ matrix.jdk.release || matrix.jdk.version }}
4249
version: latest
50+
- name: "Set up JDK ${{ matrix.jdk.version }} (${{ matrix.jdk.distribution }})"
51+
if: matrix.jdk.type == 'ga'
52+
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
53+
with:
54+
distribution: ${{ matrix.jdk.distribution }}
55+
java-version: ${{ matrix.jdk.version }}
56+
check-latest: true
4357
- name: 'Prepare JDK${{ matrix.jdk.version }} env var'
4458
shell: bash
4559
run: echo "JDK${{ matrix.jdk.version }}=$JAVA_HOME" >> $GITHUB_ENV

0 commit comments

Comments
 (0)