Correctly match the architecture of the current runner for SDK libraries to copy

Author: marcprux

action.yml

@@ -309,14 +309,11 @@ runs:
             # Swift Android SDK 6.0/6.1 targets API 24+
             SWIFT_SDK_ANROID_API="24"
             SWIFT_SDK_ID="${SWIFT_SDK_ID}-android-${SWIFT_SDK_ANROID_API}-${SWIFT_SDK_VERSION}"
-            # resourcePath in info.json in SDK 6.0/6.1 does not contain arch
-            SWIFT_SDK_ARCH_RESOURCE_PATTERN=""
           else
             # Swift Android SDK 6.2+ targets API 28+
             SWIFT_SDK_ANROID_API="28"
             # 6.2+ no longer includes the API in the artifactbundle name
             SWIFT_SDK_ID="${SWIFT_SDK_ID}-android-${SWIFT_SDK_VERSION}"
-            SWIFT_SDK_ARCH_RESOURCE_PATTERN="${SWIFT_SDK_ARCH}"
           fi
           ANDROID_SDK_URL="https://github.com/skiptools/swift-android-toolchain/releases/download/${{ steps.setup.outputs.swift-version }}/${SWIFT_SDK_ID}.artifactbundle.tar.gz"
 
@@ -345,9 +342,11 @@ runs:
         echo "SWIFT_ARTIFACTBUNDLE_SDK_ROOT_PATH=${SWIFT_ARTIFACTBUNDLE_SDK_ROOT_PATH}" >> $GITHUB_ENV
 
         # extract the swiftResourcesPath from the swift-sdk.json
-        # note that we need to use the right path for the architecure;
-        # we use a crude grep pattern for SWIFT_SDK_ARCH_RESOURCE_PATTERN
-        SWIFT_RESOURCES_ROOT_PATH=$(cat ${SWIFT_ARTIFACTBUNDLE_ROOT}/swift-sdk.json | jq -r '.targetTriples[] | .swiftResourcesPath' | grep "${SWIFT_SDK_ARCH_RESOURCE_PATTERN}" | head -n 1)
+        # note that we need to match current architecture or else
+        # we will copy the wrong libraries
+        RES_ARCH_PREFIX="${{ steps.setup.outputs.android-sdk-arch }}"
+        JQ_RES_ARCH_MATCH=".targetTriples | to_entries[] | select(.key | startswith("${RES_ARCH_PREFIX}")) | .value.swiftResourcesPath"
+        SWIFT_RESOURCES_ROOT_PATH=$(cat ${SWIFT_ARTIFACTBUNDLE_ROOT}/swift-sdk.json | jq -r "${JQ_RES_ARCH_MATCH}" | head -n 1)
         SWIFT_ARTIFACTBUNDLE_RESOURCES_ROOT_PATH="${SWIFT_ARTIFACTBUNDLE_ROOT}/${SWIFT_RESOURCES_ROOT_PATH}"
 
         echo "SWIFT_ARTIFACTBUNDLE_RESOURCES_ROOT_PATH=${SWIFT_ARTIFACTBUNDLE_RESOURCES_ROOT_PATH}" >> $GITHUB_ENV