Use the selected swift toolchain for the libarchive script

Author: cmcgee1024

.github/workflows/nightly_snapshot_check.yml

@@ -1,13 +1,16 @@
 on:
   schedule:
     - cron: '30 3 * * *'
+  # TODO REMOVE THESE
+  pull_request:
+    types: [opened, reopened, synchronize]
 
 env:
   SWIFTLY_BOOTSTRAP_VERSION: 1.0.0
 
 jobs:
   tests-selfhosted:
-    name: Test (Self Hosted) / ${{ matrix.container }}
+    name: Test (Smoke Test - Nightly Swift Toolchain) / ${{ matrix.container }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -19,9 +22,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Prepare the action
-        run: ./scripts/prep-gh-action.sh --install-swiftly
-      - name: Install main-snapshot toolchain
-        run: swiftly install main-snapshot
+        run: ./scripts/prep-gh-action.sh --install-swiftly --swift-main-snapshot
       - name: Build and Test
         # UBI 9 and Ubuntu 20.04 - See https://github.com/swiftlang/swift/issues/80908
         # UBI 9 - See https://github.com/swiftlang/swift/issues/80909

scripts/prep-gh-action.sh

@@ -16,6 +16,9 @@ while [ $# -ne 0 ]; do
         --install-swiftly)
             installSwiftly=true
             ;;
+        --swift-main-snapshot)
+            swiftMainSnapshot=true
+            ;;
         *)
             ;;
     esac
@@ -34,23 +37,34 @@ if [ "$installSwiftly" == true ]; then
         echo "PATH=$PATH" >> "$GITHUB_ENV" && echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> "$GITHUB_ENV" && echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> "$GITHUB_ENV"
     fi
 
+    selector=()
+    runSelector=()
+
+    if [ "$swiftMainSnapshot" == true ]; then
+        echo "Installing latest main-snapshot toolchain"
+        selector=("main-snapshot")
+        runSelector=("+main-snapshot")
     if [ -f .swift-version ]; then
-        echo "Installing selected swift toolchain"
-        swiftly install --post-install-file=post-install.sh
+        echo "Installing selected swift toolchain from .swift-version file"
+        selector=()
+        runSelector=()
     else
         echo "Installing latest toolchain"
-        swiftly install --post-install-file=post-install.sh latest
+        selector=("latest")
+        runSelector=("+latest")
     fi
 
+    swiftly install --post-install-file=post-install.sh "${selector[@]}"
+
     if [ -f post-install.sh ]; then
         echo "Performing swift toolchain post-installation"
         chmod u+x post-install.sh && ./post-install.sh
     fi
 
     echo "Displaying swift version"
-    swift --version
+    swift "${selector[@]} --version
 
-    CC=clang swiftly run "$(dirname "$0")/install-libarchive.sh"
+    CC=clang swiftly run "${runSelector[@]}" "$(dirname "$0")/install-libarchive.sh"
 else
     "$(dirname "$0")/install-libarchive.sh"
 fi