Update patch application for 6.2

Author: marcprux

.github/workflows/pull_request.yml

@@ -28,7 +28,8 @@ jobs:
        fail-fast: false
        matrix:
          include:
-           - swift-version: 'tag:swift-6.2-RELEASE'
+           - swift-version: '6.2'
+           #- swift-version: 'tag:swift-6.2-RELEASE'
            #- swift-version: 'tag:swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a'
            #- swift-version: 'tag:swift-6.2-DEVELOPMENT-SNAPSHOT-2025-09-10-a'
              build-type: 'docker'

swift-ci/sdks/android/scripts/build.sh

@@ -439,12 +439,6 @@ for arch in $archs; do
         # use an out-of-tree build folder
         export SWIFT_BUILD_ROOT=${build_dir}/swift-project
 
-        pushd swift
-            # apply the patch for the 6.2.0 cherry-pick of https://github.com/swiftlang/swift/pull/81596
-            curl -fsSL https://github.com/swiftlang/swift/pull/84061.patch > 84061.patch
-            git apply 84061.patch
-        popd
-
         ./swift/utils/build-script \
             $build_type_flag \
             --reconfigure \

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

@@ -149,6 +149,10 @@ 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
 
 popd >/dev/null

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

@@ -49,9 +49,6 @@ 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