ci: install adds openjdk21 and update others

armedbear · Oct 19, 2023 · 864ed24 · 864ed24
1 parent 3985f28
commit 864ed24
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/ci/install-openjdk.bash b/ci/install-openjdk.bash
@@ -30,8 +30,8 @@ function determine_openjdk() {
                     dist="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${v}-${build}/OpenJDK8U-jdk_x64_mac_hotspot_8u${v}${build}.tar.gz"
                     ;;
                 openjdk11)
-                    version=11.0.20
-                    build=8
+                    version=11.0.21
+                    build=9
                     topdir=jdk-${version}+${build}
                     dist="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK11U-jdk_x64_mac_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -51,8 +51,8 @@ function determine_openjdk() {
                     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"
                     ;;
                 openjdk17)
-                    version=17.0.8
-                    build=7
+                    version=17.0.8.1
+                    build=1
                     topdir="jdk-${version}+${build}"
                     dist="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK17U-jdk_x64_mac_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -65,6 +65,7 @@ function determine_openjdk() {
                     topdir="jdk-${id}+${rev}"
                     dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
                     ;;
+                # deprecated
                 openjdk20)
                     v="20"
                     id="${v}.0.2"
@@ -73,6 +74,14 @@ function determine_openjdk() {
                     topdir="jdk-${id}+${rev}"
                     dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
                     ;;
+                openjdk21)
+                    v="21"
+                    id="${v}"
+                    rev="35"
+                    arch="jdk_x64_mac_hotspot"
+                    topdir="jdk-${id}+${rev}"
+                    dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
+                    ;;
             esac
             ;;
         Linux)
@@ -84,8 +93,8 @@ function determine_openjdk() {
                     dist="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8${version}-${build}/OpenJDK8U-jdk_x64_linux_hotspot_8${version}${build}.tar.gz"
                     ;;
                 openjdk11)
-                    version=11.0.20
-                    build=8
+                    version=11.0.21
+                    build=9
                     topdir=jdk-${version}+${build}
                     dist="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK11U-jdk_x64_linux_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -105,8 +114,8 @@ function determine_openjdk() {
                     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"
                     ;;
                 openjdk17)
-                    version=17.0.8
-                    build=7
+                    version=17.0.8.1
+                    build=1
                     topdir="jdk-${version}+${build}"
                     dist="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK17U-jdk_x64_linux_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -127,6 +136,14 @@ function determine_openjdk() {
                     topdir="jdk-${id}+${rev}"
                     dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
                     ;;
+                openjdk21)
+                    v="21"
+                    id="${v}"
+                    rev="35"
+                    arch="jdk_x64_linux_hotspot"
+                    topdir="jdk-${id}+${rev}"
+                    dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
+                    ;;
 esac
             ;;
         *)