ci: change how we install jdk on macos

Author: ktoso

.github/actions/prepare_env/action.yml

@@ -5,10 +5,18 @@ runs:
   using: composite
   steps:
     - name: Install System Dependencies
+      if: matrix.os_version == 'jammy'
       run: apt-get -qq update && apt-get -qq install -y make curl wget libjemalloc2 libjemalloc-dev
       shell: bash
+    - name: Set up JDK ${{ matrix.jdk_version }}
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ matrix.jdk_version }}
+        distribution: ${{ matrix.jdk_vendor }}
+        cache: 'gradle'
     - name: Cache JDKs
       id: cache-jdk
+      if: matrix.os_version == 'jammy'
       uses: actions/cache@v4
       continue-on-error: true
       with:
@@ -17,12 +25,9 @@ runs:
         restore-keys: |
           ${{ runner.os }}-jdk-
     - name: Install JDK
-      if: steps.cache-jdk.outputs.cache-hit != 'true'
+      if: steps.cache-jdk.outputs.cache-hit != 'true' && matrix.os_version == 'jammy'
       run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
       shell: bash
-      # TODO: not using setup-java since incompatible with the swiftlang/swift base image
-      #      - name: Install Untested Nightly Swift
-      #        run: "bash -xc './docker/install_untested_nightly_swift.sh'"
     - name: Cache local Gradle repository
       uses: actions/cache@v4
       continue-on-error: true
@@ -34,6 +39,7 @@ runs:
         restore-keys: |
           ${{ runner.os }}-gradle-
     - name: Cache local SwiftPM repository
+      if: matrix.os_version == 'jammy'
       uses: actions/cache@v4
       continue-on-error: true
       with:

.github/workflows/pull_request.yml

@@ -22,7 +22,8 @@ jobs:
       matrix:
         swift_version: ['6.1.2']
         os_version: ['jammy']
-        jdk_vendor: ['Corretto']
+        jdk_vendor: ['corretto']
+        jdk_version: ['24']
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     env:
@@ -47,7 +48,8 @@ jobs:
       matrix:
         swift_version: ['6.1.2']
         os_version: ['macos']
-        jdk_vendor: ['Corretto']
+        jdk_vendor: ['corretto']
+        jdk_version: ['24']
     env:
       JAVA_HOME: "/usr/lib/jvm/default-jdk"
       SWIFT_JAVA_VERBOSE: true
@@ -70,7 +72,8 @@ jobs:
       matrix:
         swift_version: ['6.1.2']
         os_version: ['jammy']
-        jdk_vendor: ['Corretto']
+        jdk_vendor: ['corretto']
+        jdk_version: ['24']
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     env:
@@ -93,7 +96,8 @@ jobs:
       matrix:
         swift_version: ['6.1.2']
         os_version: ['macos']
-        jdk_vendor: ['Corretto']
+        jdk_vendor: ['corretto']
+        jdk_version: ['24']
     env:
       JAVA_HOME: "/usr/lib/jvm/default-jdk"
       SWIFT_JAVA_VERBOSE: true
@@ -114,7 +118,8 @@ jobs:
       matrix:
         swift_version: ['6.1.2']
         os_version: ['jammy']
-        jdk_vendor: ['Corretto']
+        jdk_vendor: ['corretto']
+        jdk_version: ['24']
         sample_app: [
           'JavaDependencySampleApp',
           'JavaKitSampleApp',
@@ -142,7 +147,8 @@ jobs:
       matrix:
         swift_version: ['6.1.2']
         os_version: ['sequoia']
-        jdk_vendor: ['Corretto']
+        jdk_vendor: ['corretto']
+        jdk_version: ['24']
         sample_app: [
           'JavaDependencySampleApp',
           'JavaKitSampleApp',

docker/Dockerfile

@@ -21,6 +21,6 @@ ENV LANGUAGE=en_US.UTF-8
 COPY install_jdk.sh .
 
 # JDK dependency
-RUN bash -xc 'JDK_VENDOR=Corretto ./install_jdk.sh'
+RUN bash -xc 'JDK_VENDOR=corretto ./install_jdk.sh'
 ENV JAVA_HOME="/usr/lib/jvm/default-jdk"
 ENV PATH="$PATH:/usr/lib/jvm/default-jdk/bin"

docker/install_jdk.sh

@@ -17,9 +17,9 @@ set -euo pipefail
 # We need JDK 24 because that's the supported version with latest FFM
 # However, we also need JDK 23 at most because Gradle does not support 24.
 
-# Supported JDKs: Corretto
+# Supported JDKs: corretto
 if [ "$JDK_VENDOR" = "" ]; then
-declare -r JDK_VENDOR="Corretto"
+declare -r JDK_VENDOR="corretto"
 fi
 
 apt-get update && apt-get install -y wget tree
@@ -33,7 +33,7 @@ download_and_install_jdk() {
 
     echo "Installing $JDK_VENDOR JDK (${jdk_version})..."
 
-    if [ "$JDK_VENDOR" = 'Corretto' ]; then
+    if [ "$JDK_VENDOR" = 'corretto' ]; then
         if [ "$(uname -m)" = 'aarch64' ]; then
             case "$jdk_version" in
                 "21")