Switch back to building 6.2 from a tag

Author: marcprux

swift-ci/sdks/android/scripts/fetch-source.sh

@@ -149,10 +149,11 @@ elif [[ $SWIFT_VERSION == tag:* ]]; then
     utils/update-checkout ${clone_arg} --tag ${SWIFT_VERSION#tag:} ${extra_args}
 else
     utils/update-checkout ${clone_arg} --tag swift-${SWIFT_VERSION}-RELEASE ${extra_args}
-    if [[ $SWIFT_VERSION == '6.2' ]]; then
-        curl -fsSL https://github.com/swiftlang/swift/pull/84061.patch > 84061.patch
-        git apply 84061.patch
-    fi
+fi
+
+if [[ $SWIFT_VERSION == '6.2' || $SWIFT_VERSION == 'tag:swift-6.2-RELEASE' ]]; then
+    curl -fsSL https://github.com/swiftlang/swift/pull/84061.patch > 84061.patch
+    git apply 84061.patch
 fi
 
 popd >/dev/null

swift-ci/sdks/android/scripts/toolchain-vars.sh

@@ -49,6 +49,9 @@ elif [[ $SWIFT_VERSION == scheme:* ]]; then
     echo "Building $SWIFT_VERSION with prebuilt Swift $RELEASE_TAG compiler"
     BUILD_COMPILER=yes
     echo "Branch scheme builds always build the Swift compiler from source and take much longer."
+else 
+    echo "Invalid SWIFT_VERSION: $SWIFT_VERSION"
+    exit 1
 fi
 
 SWIFT_BASE=$SWIFT_TAG-$HOST_OS