allow customizing jdk we use from the workflow

Author: ktoso

.github/workflows/pull_request.yml

@@ -14,13 +14,14 @@ jobs:
       unacceptable_language_check_word_list: "blacklist whitelist slave master sane sanity insane insanity killed killing hang hung hanged hanging" #ignore-unacceptable-language
 
   test-java:
-    name: Java tests (${{ matrix.swift_version }} - ${{ matrix.os_version }})
+    name: Java tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
         swift_version: [ 'nightly-main' ]
         os_version: [ 'jammy' ]
+        jdk_vendor: [ 'Corretto' ]
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     env:
@@ -44,13 +45,14 @@ jobs:
         run: ./gradlew build --no-daemon
 
   test-swift:
-    name: Swift tests (${{ matrix.swift_version }} - ${{ matrix.os_version }})
+    name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         swift_version: [ 'nightly-main' ]
         os_version: [ 'jammy' ]
+        jdk_vendor: [ 'Corretto' ]
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     env:
@@ -60,7 +62,7 @@ jobs:
       - name: Install Make
         run: apt update && apt install -y make
       - name: Install JDK
-        run: "bash -x ./docker/install_jdk.sh"
+        run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
       - name: Generate sources (make) (Temporary)
         # TODO: this should be triggered by the respective builds
         run: "make jextract-run"

docker/install_jdk.sh

@@ -15,7 +15,9 @@
 set -euo pipefail
 
 # Supported JDKs: Corretto or OpenJDK
-declare -r JDK_VENDOR=Corretto
+if [ "$JDK_VENDOR" = "" ]; then
+declare -r JDK_VENDOR="Corretto"
+fi
 echo "Installing $JDK_VENDOR JDK..."
 
 apt-get update && apt-get install -y wget
@@ -51,6 +53,8 @@ elif [ "$JDK_VENDOR" = 'Corretto' ]; then
   fi
 
   wget -q -O jdk.tar.gz "$JDK_URL"
+
+
   declare -r JDK_MD5="$(md5sum jdk.tar.gz | cut -d ' ' -f 1)"
   if [ "$JDK_MD5" != "$EXPECT_JDK_MD5" ]; then
     echo "Downloaded JDK MD5 does not match expected!"
@@ -60,15 +64,19 @@ elif [ "$JDK_VENDOR" = 'Corretto' ]; then
   else
     echo "JDK MD5 is correct.";
   fi
+else
+  echo "Unsupported JDK vendor: '$JDK_VENDOR'"
+  exit 1
 fi
 
 # Extract and verify the JDK installation
 
-mkdir -p /usr/lib/jvm/ && cd /usr/lib/jvm/
-tar xzvf /jdk.tar.gz
+mkdir -p /usr/lib/jvm/
+mv jdk.tar.gz /usr/lib/jvm/
+cd /usr/lib/jvm/
+tar xzvf jdk.tar.gz && rm jdk.tar.gz
 ls -lah
 mv "$(ls | head -n1)" default-jdk
-rm /jdk.tar.gz
 
 echo "JAVA_HOME = /usr/lib/jvm/default-jdk"
 /usr/lib/jvm/default-jdk/bin/java -version