Prepared gradle and swift tests with installed jdk

Author: ktoso

.github/workflows/pull_request.yml

@@ -6,32 +6,58 @@ on:
 
 jobs:
   soundness:
-    name: Soundness
-    uses: https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/soundness.yml
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
       api_breakage_check_enabled: false
+
   test-java:
     name: Java tests (${{ matrix.swift_version }} - ${{ matrix.os_version }})
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
-        swift_version: ['6.0', 'nightly-main']
-        os_version: ['jammy']
+        swift_version: [ nightly-main' ]
+        os_version: [ 'jammy' ]
+    container:
+      image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
+    env:
+      JAVA_HOME: "/usr/lib/jvm/openjdk-23"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '22'
-          cache: 'gradle'
-      - run: ./gradlew build --no-daemon
+      - name: Install Make
+        run: apt update && apt install -y make
+      - name: Install JDK
+        run: "./scripts/install_jdk.sh"
+        # TODO: not using setup-java since incompatible with the swiftlang/swift base image
+        #      - uses: actions/setup-java@v4
+        #        with:
+        #          distribution: 'zulu'
+        #          java-version: '22'
+        #          cache: 'gradle'
+      - name: Generate sources (make) (Temporary)
+        # TODO: this should be triggered by the respective builds
+        run: make jextract-run
+      - name: Gradle build
+        run: ./gradlew build --no-daemon
+
   test-swift:
     name: Swift tests (${{ matrix.swift_version }} - ${{ matrix.os_version }})
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
-    with:
-      exclude_swift_versions: "[{\"swift_version\": \"5.8\"}, {\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
-      pre_build_command: "apt-get update -y -q && apt-get install -y -q openjdk-21-jdk make"
-      build_command: "make jextract-run"
-      env_vars: |
-        JAVA_HOME="/usr/lib/jvm/java-21-openjdk-amd64"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        swift_version: [ '6.0' ]
+        os_version: [ 'jammy' ]
+    container:
+      image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Make
+        run: apt update && apt install -y make
+      - name: Install JDK
+        run: "./scripts/install_jdk.sh"
+      - name: Generate sources (make) (Temporary)
+        # TODO: this should be triggered by the respective builds
+        run: "make jextract-run"
+      - name: Test Swift
+        run: "swift test"

scripts/install_jdk.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the Swift.org open source project
+##
+## Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+set -euo pipefail
+
+declare -r JDK_VERSION=23
+echo "Installing OpenJDK $JDK_VERSION..."
+
+apt-get update && apt-get install -y make curl libc6-dev
+
+echo "Download JDK for: $(uname -m)"
+
+if [ "$(uname -m)" = 'aarch64' ]; then
+  curl https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz --output jdk.tar.gz &&
+  declare -r EXPECT_JDK_SHA=076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7;
+else
+  curl https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz --output jdk.tar.gz &&
+  declare -r EXPECT_JDK_SHA=08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67;
+fi
+
+declare -r 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!" &&
+  exit 1;
+else
+  echo "JDK SHA is correct.";
+fi
+
+# Extract and verify the JDK installation
+tar xzvf jdk.tar.gz && rm jdk.tar.gz && mkdir -p /usr/lib/jvm; mv jdk-23 /usr/lib/jvm/openjdk-23
+echo "JAVA_HOME = /usr/lib/jvm/openjdk-23"
+/usr/lib/jvm/openjdk-23/bin/java -version