ci followups

Author: ktoso

.github/workflows/pull_request.yml

@@ -20,7 +20,6 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # swift_version: ['nightly-main']
         swift_version: ['6.0.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
@@ -127,14 +126,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-swiftpm-cache
             ${{ runner.os }}-swiftpm-
-      # run the actual build
-      # - name: Generate sources (make) (Temporary)
-      #  # TODO: this should be triggered by the respective builds
-      #  run: "make jextract-generate"
       - name: Test Swift
         run: "swift test"
       - name: Build (Swift) Sample Apps
         run: .github/scripts/validate_samples.sh
-      # TODO: Benchmark compile crashes in CI, enable when nightly toolchains in better shape.
-      # - name: Build (Swift) Benchmarks
-      #  run: "swift package --package-path Benchmarks/ benchmark list"
+        # TODO: Benchmark compile crashes in CI, enable when nightly toolchains in better shape.
+        # - name: Build (Swift) Benchmarks
+        #  run: "swift package --package-path Benchmarks/ benchmark list"

.licenseignore

@@ -39,3 +39,4 @@ gradlew
 gradlew.bat
 **/gradlew
 **/gradlew.bat
+**/ci-validate.sh

docker/install_jdk.sh

@@ -75,6 +75,7 @@ fi
 
 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