allow customizing jdk we use from the workflow

Author: ktoso

.github/workflows/pull_request.yml

@@ -10,17 +10,18 @@ jobs:
     with:
       api_breakage_check_enabled: false
       license_header_check_project_name: Swift.org
-      # swift-subprocess includes the word "kill" because SIGKILL signalhandling so we allow it
+      # swift-subprocess includes the word "kill" because SIGKILL signal handling so we allow it
       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:
@@ -30,7 +31,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'"
         # TODO: not using setup-java since incompatible with the swiftlang/swift base image
         #      - uses: actions/setup-java@v4
         #        with:
@@ -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"

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -117,7 +117,7 @@ extension Swift2JavaTranslator {
       printer.print(
         """
         // FIXME: this detecting is somewhat off
-        public static final String TYPE_METADATA_NAME = "\(decl.swiftMangledName!)";
+        public static final String TYPE_METADATA_NAME = "\(decl.swiftMangledName ?? "")";
         static final MemorySegment TYPE_METADATA = SwiftKit.getTypeByMangledNameInEnvironment(TYPE_METADATA_NAME);
         """
       )

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
@@ -32,7 +34,9 @@ if [ "$JDK_VENDOR" = 'OpenJDK' ]; then
   fi
 
   wget -q -O jdk.tar.gz "$JDK_URL"
-  declare -r JDK_SHA="$(sha256sum jdk.tar.gz | cut -d ' ' -f 1)"
+
+  declare JDK_SHA # on separate lines due to: SC2155 (warning): Declare and assign separately to avoid masking return values.
+  JDK_SHA="$(sha256sum jdk.tar.gz | cut -d ' ' -f 1)"
   if [ "$JDK_SHA" != "$EXPECT_JDK_SHA" ]; then
     echo "Downloaded JDK SHA does not match expected!"
     echo "Expected: $EXPECT_JDK_SHA"
@@ -51,7 +55,9 @@ 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)"
+
+  declare JDK_MD5 # on separate lines due to: SC2155 (warning): Declare and assign separately to avoid masking return values.
+  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!"
     echo "Expected: $EXPECT_JDK_MD5"
@@ -60,15 +66,18 @@ 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
-ls -lah
-mv "$(ls | head -n1)" default-jdk
-rm /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
+mv "$(find . -depth -maxdepth 1 -type d | head -n1)" default-jdk
 
 echo "JAVA_HOME = /usr/lib/jvm/default-jdk"
 /usr/lib/jvm/default-jdk/bin/java -version