Fix support for matching nightly-6.1 to 6.1-SNAPSHOT

Author: marcprux

action.yml

@@ -103,12 +103,9 @@ runs:
           . /etc/os-release
           echo "osidpair=${ID}${VERSION_ID}" >> $GITHUB_OUTPUT
           echo "osid=${ID}$(echo ${VERSION_ID} | tr -d '.')" >> $GITHUB_OUTPUT
-          # patchelf is needed to check whether an ELF binary contains the Testing library
-          which patchelf || apt install patchelf
         elif [ ${RUNNER_OS} == 'macOS' ]; then
           echo "osidpair=macos" >> $GITHUB_OUTPUT
           echo "osid=macos" >> $GITHUB_OUTPUT
-          which patchelf || brew install patchelf
         else
           echo "::error::Unsupported platform: ${RUNNER_OS}"
           exit 1
@@ -156,9 +153,11 @@ runs:
           # use the latest snapshot release
           SWIFT_VERSION=$(cat ${SWIFT_VERSIONS_FILE} | grep -- '-SNAPSHOT' | head -n 1)
         elif [[ "${SWIFT_VERSION}" == nightly-* ]]; then
+          echo "Checking nightly build for: ${SWIFT_VERSION}"
           # e.g., nightly-6.1 will match 6.1-DEVELOPMENT-SNAPSHOT-*
           SWIFT_VERSION=$(echo ${SWIFT_VERSION} | sed 's;nightly-;;g')
           SWIFT_VERSION=$(cat ${SWIFT_VERSIONS_FILE} | grep -- "${SWIFT_VERSION}-SNAPSHOT" | head -n 1)
+          echo "Found nightly build: ${SWIFT_VERSION}"
         else
           # match "6.0" to "6.0.3"
           # match "6.1" to "6.1-DEVELOPMENT-SNAPSHOT-2025-03-07-a"
@@ -240,10 +239,13 @@ runs:
           mkdir -p ${HOME}/swift/toolchains/${{ steps.setup.outputs.swift-id }}
           tar -xzf swift.tar.gz -C ${HOME}/swift/toolchains/${{ steps.setup.outputs.swift-id }} --strip 1
           SWIFT_INSTALLATION=$HOME/swift/toolchains/${{ steps.setup.outputs.swift-id }}/usr
+          # patchelf is needed to check whether an ELF binary contains the Testing library
+          which patchelf 2>&1 > /dev/null || apt install patchelf
         elif [ ${RUNNER_OS} == 'macOS' ]; then
           /usr/sbin/installer -pkg swift.pkg -target CurrentUserHomeDirectory
           SWIFT_INSTALLATION=${HOME}/Library/Developer/Toolchains/${{ steps.setup.outputs.swift-id }}.xctoolchain/usr
           echo "TOOLCHAINS=$(plutil -extract CFBundleIdentifier raw ${SWIFT_INSTALLATION}/Info.plist)" >> $GITHUB_ENV
+          which patchelf 2>&1 > /dev/null || brew install patchelf
         else
           echo "::error::Unsupported platform: ${RUNNER_OS}"
           exit 1