Go back to building 6.2 and latest patches

Author: finagolfin

.github/workflows/pull_request.yml

@@ -28,10 +28,18 @@ jobs:
        fail-fast: false
        matrix:
          include:
-           - swift-version: 'development'
+           - swift-version: 'swift-6.2-branch'
              build-type: 'docker'
              build-compiler: '1'
              runner: 'self-hosted'
+           - swift-version: 'swift-6.2-branch'
+             build-type: 'docker'
+             build-compiler: '0'
+             runner: 'ubuntu-24.04'
+           - swift-version: 'development'
+             build-type: 'docker'
+             build-compiler: '0'
+             runner: 'ubuntu-24.04'
      runs-on: ${{ matrix.runner }}
      # 15 hour timeout
      timeout-minutes: 900

swift-ci/sdks/android/patches/apply-patches.sh

@@ -11,7 +11,6 @@ case "${BUILD_SCHEME}" in
     development)
         git apply -v -C1 ${patches_dir}/swift-android.patch
         git apply -v -C1 ${patches_dir}/swift-android-trunk-libdispatch.patch
-        git apply -v ${patches_dir}/swift-android-trunk-old-tag.patch
         ;;
     *)
         echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"

swift-ci/sdks/android/patches/swift-android-devel.patch

@@ -118,18 +118,6 @@ index f7f2664b2de..01d36e127c6 100644
 
  // CHECK-DISABLED-NOT: normal_count
 
-diff --git a/swift/test/SILOptimizer/concat_string_literals.32.swift b/swift/test/SILOptimizer/concat_string_literals.32.swift
-index 01390761c8c..d84c142397c 100644
---- a/swift/test/SILOptimizer/concat_string_literals.32.swift
-+++ b/swift/test/SILOptimizer/concat_string_literals.32.swift
-@@ -4,6 +4,7 @@
- 
- // We have a separate test for 64-bit architectures.
- // REQUIRES: PTRSIZE=32
-+// XFAIL: OS=linux-androideabi
- 
- // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
- // CHECK-LABEL: test_ascii_scalar_scalar2
 diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
 index bfb69965890..b5e9f5349c2 100644
 --- a/swift/utils/swift_build_support/swift_build_support/cmake.py

swift-ci/sdks/android/patches/swift-android-trunk-libdispatch.patch

@@ -14,19 +14,20 @@ diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swif
 index 9a0f5b43e2d..5c7d1320a2d 100644
 --- a/swift/utils/swift_build_support/swift_build_support/cmake.py
 +++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
-@@ -153,10 +153,8 @@ class CMake(object):
-             toolchain_path = product.native_toolchain_path(args.host_target)
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
-                                           os.path.join(toolchain_path, 'bin', 'swiftc'))
--            define("CMAKE_C_COMPILER:PATH", os.path.join(toolchain_path,
+@@ -150,11 +150,8 @@ class CMake(object):
+             define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
+ 
+         if self.prefer_native_toolchain and product:
+-            clang_tools_path = product.native_clang_tools_path(args.host_target)
+-            define("CMAKE_C_COMPILER:PATH", os.path.join(clang_tools_path,
 -                                                         'bin', 'clang'))
--            define("CMAKE_CXX_COMPILER:PATH", os.path.join(toolchain_path,
+-            define("CMAKE_CXX_COMPILER:PATH", os.path.join(clang_tools_path,
 -                                                           'bin', 'clang++'))
 +            define("CMAKE_C_COMPILER:PATH", toolchain.cc)
 +            define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
-             define("CMAKE_Swift_COMPILER:PATH", cmake_swiftc_path)
-         else:
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER', toolchain.swiftc)
+ 
+             toolchain_path = product.native_toolchain_path(args.host_target)
+             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
 diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
 index 3da519e..e2dd8ed 100644
 --- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake

swift-ci/sdks/android/patches/swift-android-trunk-old-tag.patch

@@ -1,3 +1,15 @@
+diff --git a/swift/test/SILOptimizer/concat_string_literals.32.swift b/swift/test/SILOptimizer/concat_string_literals.32.swift
+index 01390761c8c..d84c142397c 100644
+--- a/swift/test/SILOptimizer/concat_string_literals.32.swift
++++ b/swift/test/SILOptimizer/concat_string_literals.32.swift
+@@ -4,6 +4,7 @@
+ 
+ // We have a separate test for 64-bit architectures.
+ // REQUIRES: PTRSIZE=32
++// XFAIL: OS=linux-androideabi
+ 
+ // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
+ // CHECK-LABEL: test_ascii_scalar_scalar2
 diff --git a/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil b/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil
 index 98765e0e4a3..4dc68bf522b 100644
 --- a/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil