Skip to content

Commit 461c4b3

Browse files
jbachorikjbachorik
authored
Update Java versions, include JDK 25 (#279)
1 parent 87bad99 commit 461c4b3

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎.github/workflows/cache_java.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ on:
1616

1717
env:
1818
JDKS_DIR: jdks
19-
JAVA_8_VERSION: 8.0.452
20-
JAVA_8_J9_VERSION: 8.0.452
21-
JAVA_11_VERSION: 11.0.27
22-
JAVA_11_J9_VERSION: 11.0.27
23-
JAVA_17_VERSION: 17.0.15
24-
JAVA_17_J9_VERSION: 17.0.15
25-
JAVA_21_VERSION: 21.0.7
26-
JAVA_21_J9_VERSION: 21.0.7
27-
JAVA_24_VERSION: 24.0.1
19+
JAVA_8_VERSION: 8.0.462
20+
JAVA_8_J9_VERSION: 8.0.462
21+
JAVA_11_VERSION: 11.0.28
22+
JAVA_11_J9_VERSION: 11.0.28
23+
JAVA_17_VERSION: 17.0.16
24+
JAVA_17_J9_VERSION: 17.0.16
25+
JAVA_21_VERSION: 21.0.8
26+
JAVA_21_J9_VERSION: 21.0.8
27+
JAVA_25_VERSION: 25
2828

2929
JAVA_17_GRAAL_VERSION: 17.0.12
30-
JAVA_21_GRAAL_VERSION: 21.0.7
31-
JAVA_24_GRAAL_VERSION: 24.0.1
30+
JAVA_21_GRAAL_VERSION: 21.0.8
31+
JAVA_25_GRAAL_VERSION: 25
3232

3333
# https://gist.github.com/wavezhang/ba8425f24a968ec9b2a8619d7c2d86a6?permalink_comment_id=4444663#gistcomment-4444663
3434
# jdk1.8.0_361
@@ -45,16 +45,16 @@ env:
4545
JAVA_21_ZING_URL : "https://cdn.azul.com/zing-zvm/ZVM23.10.0.0/zing23.10.0.0-3-jdk21.0.1-linux_x64.tar.gz"
4646
JAVA_21_ZING_AARCH64_URL: "https://cdn.azul.com/zing-zvm/ZVM24.10.0.0/zing24.10.0.0-4-jdk21.0.4.0.101-linux_aarch64.tar.gz"
4747

48-
JAVA_8_MUSL_URL : "https://download.bell-sw.com/java/8u442+7/bellsoft-jdk8u442+7-linux-x64-musl-lite.tar.gz"
49-
JAVA_8_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/8u442+7/bellsoft-jdk8u442+7-linux-aarch64-musl.tar.gz"
50-
JAVA_11_MUSL_URL: "https://download.bell-sw.com/java/11.0.26+9/bellsoft-jdk11.0.26+9-linux-x64-musl-lite.tar.gz"
51-
JAVA_11_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/11.0.26+9/bellsoft-jdk11.0.26+9-linux-aarch64-musl-lite.tar.gz"
52-
JAVA_17_MUSL_URL: "https://download.bell-sw.com/java/17.0.14+10/bellsoft-jdk17.0.14+10-linux-x64-musl-lite.tar.gz"
53-
JAVA_17_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/17.0.14+10/bellsoft-jdk17.0.14+10-linux-aarch64-musl-lite.tar.gz"
54-
JAVA_21_MUSL_URL: "https://download.bell-sw.com/java/21.0.6+10/bellsoft-jdk21.0.6+10-linux-x64-musl-lite.tar.gz"
55-
JAVA_21_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/21.0.6+10/bellsoft-jdk21.0.6+10-linux-aarch64-musl-lite.tar.gz"
56-
JAVA_24_MUSL_URL: "https://download.bell-sw.com/java/24+37/bellsoft-jdk24+37-linux-x64-musl-lite.tar.gz"
57-
JAVA_24_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/24+37/bellsoft-jdk24+37-linux-aarch64-musl-lite.tar.gz"
48+
JAVA_8_MUSL_URL : "https://download.bell-sw.com/java/8u462+11/bellsoft-jdk8u462+11-linux-x64-musl-lite.tar.gz"
49+
JAVA_8_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/8u462+11/bellsoft-jdk8u462+11-linux-aarch64-musl-lite.tar.gz"
50+
JAVA_11_MUSL_URL: "https://download.bell-sw.com/java/11.0.28+12/bellsoft-jdk11.0.28+12-linux-x64-musl-lite.tar.gz"
51+
JAVA_11_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/11.0.28+12/bellsoft-jdk11.0.28+12-linux-aarch64-musl-lite.tar.gz"
52+
JAVA_17_MUSL_URL: "https://download.bell-sw.com/java/17.0.16+12/bellsoft-jdk17.0.16+12-linux-x64-musl-lite.tar.gz"
53+
JAVA_17_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/17.0.16+12/bellsoft-jdk17.0.16+12-linux-aarch64-musl-lite.tar.gz"
54+
JAVA_21_MUSL_URL: "https://download.bell-sw.com/java/21.0.8+12/bellsoft-jdk21.0.8+12-linux-x64-musl-lite.tar.gz"
55+
JAVA_21_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/21.0.8+12/bellsoft-jdk21.0.8+12-linux-aarch64-musl-lite.tar.gz"
56+
JAVA_25_MUSL_URL: "https://download.bell-sw.com/java/25+37/bellsoft-jdk25+37-linux-x64-musl-lite.tar.gz"
57+
JAVA_25_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/25+37/bellsoft-jdk25+37-linux-aarch64-musl-lite.tar.gz"
5858

5959
permissions:
6060
contents: read
@@ -146,7 +146,7 @@ jobs:
146146
strategy:
147147
fail-fast: true
148148
matrix:
149-
java_variant: [ "8", "8-orcl", "8-zing", "8-j9", "8-ibm", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "24", "24-graal" ]
149+
java_variant: [ "8", "8-orcl", "8-zing", "8-j9", "8-ibm", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "25", "25-graal" ]
150150
steps:
151151
- uses: actions/checkout@v3
152152
- name: Try restore cache JDK ${{ matrix.java_variant }}
@@ -205,7 +205,7 @@ jobs:
205205
strategy:
206206
fail-fast: true
207207
matrix:
208-
java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
208+
java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "25-librca" ]
209209
steps:
210210
- uses: actions/checkout@v3
211211
- name: Setup OS
@@ -255,7 +255,7 @@ jobs:
255255
strategy:
256256
fail-fast: true
257257
matrix:
258-
java_variant: [ "8", "8-zing", "8-j9", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "24", "24-graal" ]
258+
java_variant: [ "8", "8-zing", "8-j9", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "25", "25-graal" ]
259259
steps:
260260
- uses: actions/checkout@v3
261261
- name: Cache JDK ${{ matrix.java_variant }}
@@ -312,7 +312,7 @@ jobs:
312312
strategy:
313313
fail-fast: true
314314
matrix:
315-
java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
315+
java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "25-librca" ]
316316
steps:
317317
- uses: actions/checkout@v3
318318
- name: Setup OS

‎.github/workflows/test_workflow.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
java_version: [ "8", "8-orcl", "8-j9", "8-zing", "8-ibm", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "24", "24-graal" ]
23+
java_version: [ "8", "8-orcl", "8-j9", "8-zing", "8-ibm", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "25", "25-graal" ]
2424
config: ${{ fromJson(inputs.configuration) }}
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 180
@@ -145,7 +145,7 @@ jobs:
145145
strategy:
146146
fail-fast: false
147147
matrix:
148-
java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
148+
java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "25-librca" ]
149149
config: ${{ fromJson(inputs.configuration) }}
150150
runs-on: ubuntu-latest
151151
container:
@@ -270,7 +270,7 @@ jobs:
270270
matrix:
271271
# java_version: [ "8", "8-j9", "8-zing", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "23", "23-graal" ]
272272
# FIXME: Hotspot 8 and 11 versions are rather crashy in ASGCT on aarch64, so we are skipping them for now
273-
java_version: [ "8-j9", "8-zing", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "24", "24-graal" ]
273+
java_version: [ "8-j9", "8-zing", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "25", "25-graal" ]
274274
config: ${{ fromJson(inputs.configuration) }}
275275
runs-on:
276276
group: ARM LINUX SHARED
@@ -399,7 +399,7 @@ jobs:
399399
strategy:
400400
fail-fast: false
401401
matrix:
402-
java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
402+
java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "25-librca" ]
403403
config: ${{ fromJson(inputs.configuration) }}
404404
runs-on:
405405
group: ARM LINUX SHARED

0 commit comments

Comments
 (0)