Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: update openjdk installation; tesk openjdk22 #669

Merged
merged 1 commit into from
Apr 29, 2024
Merged

ci: update openjdk installation; tesk openjdk22 #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/abcl-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
jdk: [openjdk8, openjdk11, openjdk17, openjdk21]
jdk: [openjdk8, openjdk11, openjdk17, openjdk21, openjdk22]

steps:
- name: Set path for build scripts
Expand Down
51 changes: 34 additions & 17 deletions ci/install-openjdk.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ function determine_openjdk() {
[Dd]arwin|darwin|macos)
case $jdk in
openjdk8)
v=402
build=b06
v=412
build=b08
version=1.8.0.${v}
topdir=jdk8u${v}-${build}
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.22
build=7
version=11.0.23
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"
;;
Expand All @@ -53,8 +53,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.10
build=7
version=17.0.11
build=9
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"
;;
Expand All @@ -78,8 +78,17 @@ function determine_openjdk() {
;;
openjdk21)
v="21"
id="${v}.0.2"
rev="13"
id="${v}.0.3"
rev="9"
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"
;;
openjdk22)
v="22"
id="${v}.0.1"
rev="8"
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"
Expand All @@ -89,14 +98,14 @@ function determine_openjdk() {
[Ll]inux)
case $jdk in
openjdk8)
version=u402
build=b06
version=u412
build=b08
topdir=jdk8${version}-${build}
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.22
build=7
version=11.0.23
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"
;;
Expand All @@ -116,8 +125,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.10
build=7
version=17.0.11
build=9
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"
;;
Expand All @@ -140,13 +149,21 @@ function determine_openjdk() {
;;
openjdk21)
v="21"
id="${v}.0.2"
rev="13"
id="${v}.0.3"
rev="9"
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
openjdk22)
v="22"
id="${v}.0.1"
rev="8"
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
;;
*)
echo No known dist for ${uname}
Expand Down