musl

Author: jbachorik

.github/scripts/java_setup.sh

@@ -12,22 +12,21 @@ function prepareJdk() {
 
   mkdir -p ${target_path}
 
-  local suffix="tem"
-  local versionVar="JAVA_${version}_VERSION"
-  if [[ "${qualifier}" == "j9" ]]; then
-    suffix="sem"
-    versionVar="JAVA_${version}_J9_VERSION"
-  elif [[ "${qualifier}" == "graal" ]]; then
-    suffix="graal"
-    versionVar="JAVA_${version}_GRAAL_VERSION"
+  if [[ ${qualifier} == "librca" ]] && [[ "${arch}" =~ "-musl" ]]; then
+    URL_VAR="JAVA_${version}_MUSL_URL"
+    URL="${!URL_VAR}"
+    if [[ -z "${URL}" ]]; then
+      echo "Musl/Liberica JDK URL not found for ${arch}/${variant}"
+      exit 1
+    fi
+    curl -L --fail "${URL}" | sudo tar -xvzf - -C ${target_path} --strip-components 1
+    return
   fi
 
   if [[ ${qualifier} == "orcl" ]]; then
     if [[ ${version} == "8" ]]; then
-      # https://gist.github.com/wavezhang/ba8425f24a968ec9b2a8619d7c2d86a6?permalink_comment_id=4444663#gistcomment-4444663
-      # jdk1.8.0_361
       mkdir -p "${target_path}"
-      curl -L --fail "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=247926_0ae14417abb444ebb02b9815e2103550" | sudo tar -xvzf - -C ${target_path} --strip-components 1
+      curl -L --fail "${JAVA_8_ORACLE_URL}" | sudo tar -xvzf - -C ${target_path} --strip-components 1
       return
     else
       echo "Oracle JDK 8 only!"
@@ -52,6 +51,16 @@ function prepareJdk() {
     return
   fi
 
+  local suffix="tem"
+  local versionVar="JAVA_${version}_VERSION"
+  if [[ "${qualifier}" == "j9" ]]; then
+    suffix="sem"
+    versionVar="JAVA_${version}_J9_VERSION"
+  elif [[ "${qualifier}" == "graal" ]]; then
+    suffix="graal"
+    versionVar="JAVA_${version}_GRAAL_VERSION"
+  fi
+
   local distro_base
   distro_base="${!versionVar}"
   local jdk_distro="${distro_base}-${suffix}"

.github/workflows/cache_java.yml

@@ -25,6 +25,10 @@ env:
   JAVA_21_GRAAL_VERSION: 21.0.6
   JAVA_23_GRAAL_VERSION: 23.0.2
 
+  # https://gist.github.com/wavezhang/ba8425f24a968ec9b2a8619d7c2d86a6?permalink_comment_id=4444663#gistcomment-4444663
+  # jdk1.8.0_361
+  JAVA_8_ORACLE_URL: "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=247926_0ae14417abb444ebb02b9815e2103550"
+
   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"
@@ -34,6 +38,12 @@ env:
   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"
   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"
 
+  JAVA_8_MUSL_URL: "https://download.bell-sw.com/java/8u432+7/bellsoft-jdk8u432+7-linux-x64-musl.tar.gz"
+  JAVA_11_MUSL_URL: "https://download.bell-sw.com/java/11.0.25+11/bellsoft-jdk11.0.25+11-linux-x64-musl.tar.gz"
+  JAVA_17_MUSL_URL: "https://download.bell-sw.com/java/17.0.13+12/bellsoft-jdk17.0.13+12-linux-x64-musl.tar.gz"
+  JAVA_21_MUSL_URL: "https://download.bell-sw.com/java/21.0.5+11/bellsoft-jdk21.0.5+11-linux-x64-musl.tar.gz"
+  JAVA_23_MUSL_URL: "https://download.bell-sw.com/java/23.0.1+13/bellsoft-jdk23.0.1+13-linux-x64-musl.tar.gz"
+
 permissions:
   contents: read
   actions: read
@@ -79,48 +89,6 @@ jobs:
           name: sdkman-installation-amd64
           path: ${{ env.SDKMAN_DIR }}
 
-  setup-sdkman-amd64-musl:
-    runs-on: ubuntu-latest
-    container:
-      image: "alpine:3.14"
-      options: --cpus 2 --workdir /github/workspace -v /home/runner/work/_temp:/home/runner/work/_temp
-    outputs:
-      sdkman_path: ${{ steps.export-path.outputs.sdkman_path }}
-    steps:
-      - name: Setup OS
-        run: |
-          # This needs to be done early because alpine does not have bash and tar is also iffy
-          apk update && apk add curl zip unzip bash tar
-      - name: Cache SDKMan! AMD64/MUSL
-        uses: actions/cache@v4
-        with:
-          path: sdkman
-          key: sdkman-amd64-musl-${{ github.run_id }}
-          restore-keys: |
-            sdkman-amd64-musl-
-      - name: Check if SDKMAN! is Already Installed
-        id: check-sdkman
-        run: |
-          if [ -e "${GITHUB_WORKSPACE}/sdkman/bin/sdkman-init.sh" ]; then
-            echo "SDKMAN! already installed at ${GITHUB_WORKSPACE}/sdkman."
-            echo "skip_install=true" >> $GITHUB_ENV
-          else
-            echo "SDKMAN! not found, proceeding with installation."
-            echo "skip_install=false" >> $GITHUB_ENV
-          fi
-          echo "SDKMAN_DIR=${GITHUB_WORKSPACE}/sdkman" >> $GITHUB_ENV
-      - name: Install SDKMAN!
-        if: env.skip_install == 'false'
-        run: |
-          curl -s "https://get.sdkman.io" | bash
-          mkdir -p ${GITHUB_WORKSPACE}/sdkman
-          cp -r $HOME/.sdkman/* ${SDKMAN_DIR}
-      - name: Upload SDKMAN! as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdkman-installation-amd64-musl
-          path: ${{ env.SDKMAN_DIR }}
-
   setup-sdkman-aarch64:
     runs-on:
       group: ARM LINUX SHARED
@@ -204,11 +172,10 @@ jobs:
           prepareJdk ${{ matrix.java_variant }} amd64
 
   cache-amd64-musl:
-    needs: setup-sdkman-amd64-musl
     runs-on: ubuntu-latest
     container:
       image: "alpine:3.14"
-      options: --cpus 2  --workdir /github/workspace -v /home/runner/work/_temp:/home/runner/work/_temp
+      options: --cpus 2
     strategy:
       fail-fast: true
       matrix:
@@ -226,21 +193,11 @@ jobs:
           path: |
             ${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
           key: jdk${{matrix.java_variant }}-amd64-musl--${{ hashFiles('.github/workflows/cache_java.yml') }}
-      - name: Download SDKMAN! from Artifact
-        if: steps.cache-jdk.outputs.cache-hit != 'true'
-        uses: actions/download-artifact@v4
-        with:
-          name: sdkman-installation-amd64-musl
-          path: sdkman
 
       - name: Install JDK ${{ matrix.java_variant }}
         if: steps.cache-jdk.outputs.cache-hit != 'true'
         shell: bash
         run: |
-          mv $GITHUB_WORKSPACE/sdkman ~/.sdkman
-          mkdir -p ~/.sdkman/ext # Create ext directory; it is empty and not uploaded
-          mkdir -p ~/.sdkman/tmp # Create tmp directory; it is empty and not uploaded
-          
           source .github/scripts/java_setup.sh
 
           prepareJdk ${{ matrix.java_variant }} amd64-musl