correct jdk caching, now that we have to cache two JDKs

Author: ktoso

.github/actions/prepare_env/action.yml

@@ -7,15 +7,15 @@ runs:
     - name: Install System Dependencies
       run: apt-get -qq update && apt-get -qq install -y make curl wget libjemalloc2 libjemalloc-dev
       shell: bash
-    - name: Cache JDK
+    - name: Cache JDKs
       id: cache-jdk
       uses: actions/cache@v4
       continue-on-error: true
       with:
-        path: /usr/lib/jvm/default-jdk/
-        key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/default-jdk/*') }}
+        path: /usr/lib/jvm/
+        key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/*') }}
         restore-keys: |
-          ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}
+          ${{ runner.os }}-jdk-
     - name: Install JDK
       if: steps.cache-jdk.outputs.cache-hit != 'true'
       run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"

Samples/SwiftAndJavaJarSampleLib/ci-validate.sh

@@ -3,26 +3,28 @@
 set -e
 set -x
 
-export PATH="${PATH}:${JAVA_HOME}/bin"
-
 ./gradlew jar
 
+# we make sure to build and run with JDK 24 because the runtime needs latest JDK, unlike Gradle which needed 21.
+export PATH="${PATH}:/usr/lib/jvm/jdk-24/bin"
+
 # check if we can compile a plain Example file that uses the generated Java bindings that should be in the generated jar
-javac -cp bin/default/build/libs/*jar Example.java
+MYLIB_CLASSPATH="$(ls bin/default/build/libs/*.jar)"
+javac -cp "${MYLIB_CLASSPATH}" Example.java
 
 if [ "$(uname -s)" = 'Linux' ]
 then
-  SWIFT_LIB_PATHS=$HOME/.local/share/swiftly/toolchains/6.2-snapshot-2025-06-17/usr/lib/swift/linux/
+  SWIFT_LIB_PATHS=/usr/lib/swift/linux
   SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(find . | grep libMySwiftLibrary.so$ | sort | head -n1 | xargs dirname)"
 elif [ "$(uname -s)" = 'Darwin' ]
 then
-  # - find libswiftCore.dylib
   SWIFT_LIB_PATHS=$(find "$(swiftly use --print-location)" | grep dylib$ | grep libswiftCore | grep macos | xargs dirname)
-  # - find our library dylib
   SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(find . | grep libMySwiftLibrary.dylib$ | sort | head -n1 | xargs dirname)"
 fi
 
 # Can we run the example?
+SWIFTKIT_CLASSPATH="$(ls ../../SwiftKit/build/libs/*.jar)"
 java --enable-native-access=ALL-UNNAMED \
-     -Djava.library.path="${SWIFT_LIB_PATHS}" -cp ".:bin/default/build/libs/*:../../SwiftKit/build/libs/*" \
+     -Djava.library.path="${SWIFT_LIB_PATHS}" \
+     -cp ".:${MYLIB_CLASSPATH}:${SWIFTKIT_CLASSPATH}" \
      Example