Skip to content

Commit 67d29e9

Browse files
committed
ci: update openjdk installations to latest
Robustify syntax for specifying operating system and architecture.
1 parent a1320c5 commit 67d29e9

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

ci/install-openjdk.bash

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ dist=
2020
function determine_openjdk() {
2121
case $uname in
2222
# just x86_64 for now. We've got Rosseta2 c'est nes pas?
23-
Darwin)
23+
[Dd]arwin|darwin|macos)
2424
case $jdk in
2525
openjdk8)
26-
v=392
27-
build=b08
26+
v=402
27+
build=b06
2828
version=1.8.0.${v}
2929
topdir=jdk8u${v}-${build}
3030
dist="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${v}-${build}/OpenJDK8U-jdk_x64_mac_hotspot_8u${v}${build}.tar.gz"
3131
;;
3232
openjdk11)
33-
version=11.0.21
34-
build=9
33+
version=11.0.22
34+
build=7
3535
topdir=jdk-${version}+${build}
3636
dist="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK11U-jdk_x64_mac_hotspot_${version}_${build}.tar.gz"
3737
;;
@@ -51,8 +51,8 @@ function determine_openjdk() {
5151
dist="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz"
5252
;;
5353
openjdk17)
54-
version=17.0.9
55-
build=9
54+
version=17.0.10
55+
build=7
5656
topdir="jdk-${version}+${build}"
5757
dist="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK17U-jdk_x64_mac_hotspot_${version}_${build}.tar.gz"
5858
;;
@@ -76,25 +76,25 @@ function determine_openjdk() {
7676
;;
7777
openjdk21)
7878
v="21"
79-
id="${v}.0.1"
80-
rev="12"
79+
id="${v}.0.2"
80+
rev="13"
8181
arch="jdk_x64_mac_hotspot"
8282
topdir="jdk-${id}+${rev}"
8383
dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
8484
;;
8585
esac
8686
;;
87-
Linux)
87+
[Ll]inux)
8888
case $jdk in
8989
openjdk8)
90-
version=u392
91-
build=b08
90+
version=u402
91+
build=b06
9292
topdir=jdk8${version}-${build}
9393
dist="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8${version}-${build}/OpenJDK8U-jdk_x64_linux_hotspot_8${version}${build}.tar.gz"
9494
;;
9595
openjdk11)
96-
version=11.0.21
97-
build=9
96+
version=11.0.22
97+
build=7
9898
topdir=jdk-${version}+${build}
9999
dist="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK11U-jdk_x64_linux_hotspot_${version}_${build}.tar.gz"
100100
;;
@@ -114,8 +114,8 @@ function determine_openjdk() {
114114
dist="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
115115
;;
116116
openjdk17)
117-
version=17.0.9
118-
build=9
117+
version=17.0.10
118+
build=7
119119
topdir="jdk-${version}+${build}"
120120
dist="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK17U-jdk_x64_linux_hotspot_${version}_${build}.tar.gz"
121121
;;
@@ -138,8 +138,8 @@ function determine_openjdk() {
138138
;;
139139
openjdk21)
140140
v="21"
141-
id="${v}.0.1"
142-
rev="12"
141+
id="${v}.0.2"
142+
rev="13"
143143
arch="jdk_x64_linux_hotspot"
144144
topdir="jdk-${id}+${rev}"
145145
dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"

0 commit comments

Comments
 (0)