Start building the 6.2 release on the CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -24,7 +24,7 @@ jobs:
         id: version
         run: |
           if [ ${{ matrix.version }} = 'release' ]; then
-            LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/releases | grep -m1 swift-6.1 | cut -d- -f2)
+            LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/releases | grep -m1 swift-6.2 | cut -d- -f2)
             SWIFT_TAG="swift-${LATEST_TOOLCHAIN_VERSION}-RELEASE"
           elif [ ${{ matrix.version }} = 'devel' ]; then
             LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-6.2-DEV | cut -d- -f8-10)
@@ -129,29 +129,22 @@ jobs:
 
           git apply -C1 swift-android.patch swift-android-ci.patch
           BUILD_FLAG="--foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
-          if ${{ matrix.version == 'release' }}; then
-            perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
-            BUILD_FLAG+=" --build-swift-tools=0"
-            LSP_BUILD="--sourcekit-lsp"
-            git apply swift-android-ci-release.patch swift-android-testing-release.patch
+          if ${{ matrix.version == 'trunk' }}; then
+            git apply swift-android-trunk-libdispatch.patch
+            BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
           else
-            if ${{ matrix.version == 'trunk' }}; then
-              git apply swift-android-trunk-libdispatch.patch
-              BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
-            else
-              git apply swift-android-ci-devel.patch swift-android-devel.patch
+            git apply swift-android-ci-except-trunk.patch swift-android-except-trunk.patch
+            if ${{ matrix.version == 'release' }}; then
+              git apply swift-android-testing-release.patch
             fi
-            git apply -C2 swift-android-ci-except-release.patch
-            BUILD_FLAG+=" --cross-compile-build-swift-tools=False"
-            SDK_NAME=$(ls | grep swift-${{ matrix.version }}-android-aarch64)
-            perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h
           fi
 
+          perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h
           perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
           perl -pi -e "s%swift/android',%swift/android', '-Xlinker', '-landroid-spawn',%" sourcekit-lsp/Utilities/build-script-helper.py
           VERSION="$(echo ${{ steps.version.outputs.tag }} | cut -f1,2 -d-)-${{ matrix.version }}"
 
-          # e.g. swift-6.1-release-android-24-sdk
+          # e.g. swift-6.2-release-android-24-sdk
           SDK_DIR=$VERSION-android-${ANDROID_API_LEVEL}-sdk
           ROOT=android-${NDK_VERSION}-sysroot
           SYSROOT=$SDK_DIR/$ROOT
@@ -171,7 +164,7 @@ jobs:
             cp $SYSROOT/usr/include/execinfo.h ${SDK_NAME}/usr/include
             perl -pi -e 's%33%24%' ${SDK_NAME}/usr/include/execinfo.h
 
-            ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b --install-llbuild --swift-testing --install-swift-testing -p $BUILD_FLAG $LSP_BUILD
+            ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False --cross-compile-build-swift-tools=False -b --install-llbuild --swift-testing --install-swift-testing -p $BUILD_FLAG
 
             rm $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift
 

get-packages-and-swift-source.swift

@@ -13,12 +13,12 @@ var swiftRepos = ["llvm-project", "swift", "swift-experimental-string-processing
 
 let extraSwiftRepos = ["swift-llbuild", "swift-package-manager", "swift-driver",
                        "swift-tools-support-core", "swift-argument-parser", "swift-crypto",
-                       "Yams", "indexstore-db", "sourcekit-lsp", "swift-system", "swift-lmdb",
-                       "swift-certificates", "swift-asn1", "swift-toolchain-sqlite"]
+                       "indexstore-db", "sourcekit-lsp", "swift-system", "swift-lmdb",
+                       "swift-certificates", "swift-asn1", "swift-toolchain-sqlite", "swift-build"]
 let appleRepos = ["swift-argument-parser", "swift-crypto", "swift-system", "swift-collections", "swift-certificates", "swift-asn1"]
-let renameRepos = ["swift-llbuild" : "llbuild", "swift-package-manager" : "swiftpm", "Yams" : "yams"]
+let renameRepos = ["swift-llbuild" : "llbuild", "swift-package-manager" : "swiftpm"]
 var repoTags = ["swift-system" : "1.5.0", "swift-collections" : "1.1.3", "swift-asn1" : "1.0.0",
-                "swift-certificates" : "1.0.1", "Yams" : "5.0.6", "swift-argument-parser" : "1.4.0",
+                "swift-certificates" : "1.0.1", "swift-argument-parser" : "1.4.0",
                 "swift-crypto" : "3.0.0", "swift-toolchain-sqlite" : "1.0.1"]
 if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
   swiftRepos += extraSwiftRepos
@@ -54,13 +54,9 @@ if tagExtract.numberOfMatches(in: SWIFT_TAG, range: tagRange) == 1 {
 }
 
 if swiftBranch == "RELEASE" {
-  repoTags["swift-system"] = "1.3.0"
   sdkDir = "swift-release-android-\(ANDROID_ARCH)-24-sdk"
 } else {
   sdkDir = "swift-\(swiftVersion == "" ? "trunk" : "devel")-android-\(ANDROID_ARCH)-\(swiftSnapshotDate)-24-sdk"
-  if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
-    swiftRepos += ["swift-build"]
-  }
   if swiftVersion == "" {
     repoTags["swift-collections"] = "1.1.6"
     repoTags["swift-argument-parser"] = "1.5.1"
@@ -283,9 +279,7 @@ for repo in swiftRepos {
     print("Downloading and extracting \(repo) source")
     let tag = repoTags[repo] ?? SWIFT_TAG
     var repoOrg = "swiftlang"
-    if repo == "Yams" {
-      repoOrg = "jpsim"
-    } else if appleRepos.contains(repo) {
+    if appleRepos.contains(repo) {
       repoOrg = "apple"
     }
     _ = runCommand("curl", with: ["-f", "-L", "-O",

swift-android-ci-except-release.patch

@@ -53,3 +53,43 @@ diff --git a/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swi
  #elseif canImport(Darwin)
  import Darwin
  #endif
+diff --git a/swift-build/Sources/SWBUtil/Lock.swift b/swift-build/Sources/SWBUtil/Lock.swift
+index 2135ce6..fbff6f6 100644
+--- a/swift-build/Sources/SWBUtil/Lock.swift
++++ b/swift-build/Sources/SWBUtil/Lock.swift
+@@ -14,6 +14,8 @@
+ public import os
+ #elseif os(Windows)
+ public import WinSDK
++#elseif canImport(Android)
++public import Android
+ #else
+ public import SWBLibc
+ #endif
+diff --git a/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift b/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift
+index ffa6b7f3f..abe453232 100644
+--- a/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift
++++ b/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift
+@@ -24,6 +24,10 @@ import struct TSCBasic.ByteString
+ import struct TSCBasic.SHA256
+ import Workspace
+ 
++#if canImport(Android)
++import Android
++#endif
++
+ // Format for the .zip.json files.
+ struct Artifact: Codable {
+     var platform: Workspace.PrebuiltsManifest.Platform
+diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
+index 156bf002a..d891da556 100755
+--- a/swiftpm/Utilities/bootstrap
++++ b/swiftpm/Utilities/bootstrap
+@@ -941,6 +941,7 @@ def get_swiftpm_flags(args):
+             build_flags += ["--arch", "x86_64", "--arch", "arm64"]
+         elif cross_compile_hosts.startswith('android-'):
+             build_flags.extend(["--destination", args.cross_compile_config])
++            build_flags.extend(["-Xlinker", "-landroid-spawn"])
+         else:
+             logging.error("cannot cross-compile for %s", cross_compile_hosts)
+             raise SystemExit(1)