cleanup

Author: ktoso

.github/actions/prepare_env/action.yml

@@ -4,10 +4,6 @@ description: 'Prepare the CI environment by installing Swift and selected JDK et
 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:
@@ -16,30 +12,6 @@ runs:
           24
           21
         cache: 'gradle'
-#    - name: Cache JDKs
-#      id: cache-jdk
-#      if: matrix.os_version == 'jammy'
-#      uses: actions/cache@v4
-#      continue-on-error: true
-#      with:
-#        path: /usr/lib/jvm/
-#        key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/*') }}
-#        restore-keys: |
-#          ${{ runner.os }}-jdk-
-#    - name: Install JDK
-#      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
-#    - name: Cache local Gradle repository
-#      uses: actions/cache@v4
-#      continue-on-error: true
-#      with:
-#        path: |
-#          /root/.gradle/caches
-#          /root/.gradle/wrapper
-#        key: ${{ runner.os }}-gradle-${{ hashFiles('*/*.gradle*', 'settings.gradle') }}
-#        restore-keys: |
-#          ${{ runner.os }}-gradle-
     - name: Cache local SwiftPM repository
       if: matrix.os_version == 'jammy'
       uses: actions/cache@v4

.github/workflows/pull_request.yml

@@ -115,7 +115,7 @@ jobs:
         swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['corretto']
-        sample_app: [
+        sample_app: [ # TODO: use a reusable-workflow to generate those names
           'JavaDependencySampleApp',
           'JavaKitSampleApp',
           'JavaProbablyPrime',
@@ -131,7 +131,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
-      - name: "Verify sample"
+      - name: "Verify sample: ${{ matrix.sample_app }}"
         run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
 
   verify-samples-macos:
@@ -143,7 +143,7 @@ jobs:
         swift_version: ['6.1.2']
         os_version: ['macos']
         jdk_vendor: ['corretto']
-        sample_app: [
+        sample_app: [ # TODO: use a reusable-workflow to generate those names
           'JavaDependencySampleApp',
           'JavaKitSampleApp',
           'JavaProbablyPrime',
@@ -157,5 +157,5 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
-      - name: "Verify sample"
+      - name: "Verify sample ${{ matrix.sample_app }}"
         run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}

Samples/SwiftAndJavaJarSampleLib/ci-validate.sh

@@ -6,14 +6,12 @@ set -x
 ./gradlew jar
 
 SWIFT_VERSION="$(swift -version | awk '/Swift version/ { print $3 }')"
+ARCH=$(uname -m)
 
-# we make sure to build and run with JDK 24 because the runtime needs latest JDK, unlike Gradle which needed 21.
-if [ "$(uname -s)" = 'Darwin' ]
-then
-  export OS='osx'
+if [ -n "$JAVA_HOME_24_$ARCH" ]; then
+   export JAVA_HOME="$JAVA_HOME_24_$ARCH"
 elif [ "$(uname -s)" = 'Linux' ]
 then
-  export OS='linux'
   export PATH="${PATH}:/usr/lib/jvm/jdk-24/bin" # we need to make sure to use the latest JDK to actually compile/run the executable
 fi
 
@@ -24,8 +22,12 @@ MYLIB_CLASSPATH="$(pwd)/build/libs/*"
 CLASSPATH="$(pwd)/:${SWIFTKIT_CLASSPATH}:${MYLIB_CLASSPATH}"
 echo "CLASSPATH       = ${CLASSPATH}"
 
-javac -cp "${CLASSPATH}" Example.java
+JAVAC="${JAVA_HOME}/bin/javac"
+JAVA="${JAVA_HOME}/bin/java"
+
+$JAVAC -cp "${CLASSPATH}" Example.java
 
+# TODO: move all this into Gradle or SwiftPM and make it easier to get the right classpath for running
 if [ "$(uname -s)" = 'Linux' ]
 then
   SWIFT_LIB_PATHS=/usr/lib/swift/linux
@@ -50,7 +52,7 @@ fi
 echo "SWIFT_LIB_PATHS = ${SWIFT_LIB_PATHS}"
 
 # Can we run the example?
-java --enable-native-access=ALL-UNNAMED \
+${JAVA} --enable-native-access=ALL-UNNAMED \
      -Djava.library.path="${SWIFT_LIB_PATHS}" \
      -cp "${CLASSPATH}" \
      Example