resort to Swiftly to simplify locating swift dylib paths for samples

Author: ktoso

.github/scripts/prep-gh-action.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This script is reused from Swiftly itself, see:
+# https://github.com/swiftlang/swiftly/blob/main/scripts/prep-gh-action.sh
+#
 # This script does a bit of extra preparation of the docker containers used to run the GitHub workflows
 # that are specific to this project's needs when building/testing. Note that this script runs on
 # every supported Linux distribution and macOS so it must adapt to the distribution that it is running.
@@ -57,6 +60,10 @@ if [ "$installSwiftly" == true ]; then
         echo "Installing latest main-snapshot toolchain"
         selector=("main-snapshot")
         runSelector=("+main-snapshot")
+    elif [ -n "${SWIFT_VERSION}" ]; then
+        echo "Installing selected swift toolchain from SWIFT_VERSION environment variable"
+        selector=("${SWIFT_VERSION}")
+        runSelector=("${SWIFT_VERSION}")
     elif [ -f .swift-version ]; then
         echo "Installing selected swift toolchain from .swift-version file"
         selector=()

.github/workflows/pull_request.yml

@@ -142,9 +142,14 @@ jobs:
       - uses: actions/checkout@v4
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
+      - name: Prepare the action
+        run: ./.github/scripts/prep-gh-action.sh --install-swiftly
+        env:
+          SWIFT_VERSION: "${{ matrix.swift_version }}"
       - name: "Verify sample: ${{ matrix.sample_app }}"
         run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
 
+
   verify-samples-macos:
     name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
     runs-on: [self-hosted, macos, sequoia, ARM64]