diff --git a/.github/scripts/java_setup.sh b/.github/scripts/java_setup.sh index c09fe8918..024649759 100644 --- a/.github/scripts/java_setup.sh +++ b/.github/scripts/java_setup.sh @@ -32,6 +32,17 @@ function prepareJdk() { fi fi + if [[ ${qualifier} == "ibm" ]]; then + if [[ ${version} == "8" ]]; then + mkdir -p "${target_path}" + curl -L --fail "${JAVA_8_IBM_URL}" | sudo tar -xvzf - -C ${target_path} --strip-components 2 + return + else + echo "IBM JDK 8 only!" + exit 1 + fi + fi + if [[ ${qualifier} == "zing" ]]; then URL_VAR="JAVA_${version}_ZING_URL" if [[ "${arch}" == "aarch64" ]]; then diff --git a/.github/workflows/cache_java.yml b/.github/workflows/cache_java.yml index 44608fe39..381a1925a 100644 --- a/.github/workflows/cache_java.yml +++ b/.github/workflows/cache_java.yml @@ -34,6 +34,8 @@ env: # jdk1.8.0_361 JAVA_8_ORACLE_URL: "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=247926_0ae14417abb444ebb02b9815e2103550" + JAVA_8_IBM_URL: "https://public.dhe.ibm.com/ibmdl/export/pub/systems/cloud/runtimes/java/8.0.8.40/linux/x86_64/ibm-java-jre-8.0-8.40-linux-x86_64.tgz" + JAVA_8_ZING_URL : "https://cdn.azul.com/zing-zvm/ZVM23.05.0.0/zing23.05.0.0-2-jdk8.0.372-linux_x64.tar.gz" JAVA_8_ZING_AARCH64_URL : "https://cdn.azul.com/zing-zvm/ZVM24.10.0.0/zing24.10.0.0-4-jdk8.0.431-linux_aarch64.tar.gz" JAVA_11_ZING_URL : "https://cdn.azul.com/zing-zvm/ZVM23.05.0.0/zing23.05.0.0-2-jdk11.0.19-linux_x64.tar.gz" @@ -138,7 +140,7 @@ jobs: strategy: fail-fast: true matrix: - java_variant: [ "8", "8-orcl", "8-zing", "8-j9", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "23", "23-graal" ] + 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", "23", "23-graal" ] steps: - uses: actions/checkout@v3 - name: Try restore cache JDK ${{ matrix.java_variant }} diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml index aed401479..65f5c2cc7 100644 --- a/.github/workflows/test_workflow.yml +++ b/.github/workflows/test_workflow.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [ "8", "8-orcl", "8-j9", "8-zing", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "23", "23-graal" ] + 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", "23", "23-graal" ] config: ${{ fromJson(inputs.configuration) }} runs-on: ubuntu-latest timeout-minutes: 180