Don't build the devel snapshots on the CI till the first 6.2 snapshot tag

Also, start building trunk SwiftPM again just without swift-build, which has no
snapshot tags yet, and check out the last Mar. 28 tag of trunk sourcekit-lsp for
now as it isn't being tagged upstream recently, some infrastructure error.

Author: finagolfin

.github/workflows/sdks.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [release, devel, trunk]
+        version: [release, trunk]
         os: [ubuntu-24.04, macos-13]
     env:
       ANDROID_API_LEVEL: 24
@@ -127,10 +127,10 @@ jobs:
           done
 
           git apply swift-android.patch
-          git apply swift-android-ci.patch
+          git apply -C1 swift-android-ci.patch
           if ${{ matrix.version == 'release' }}; then
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
-            LSP_BUILD="-p --sourcekit-lsp"
+            LSP_BUILD="--sourcekit-lsp"
             git apply swift-android-ci-release.patch swift-android-testing-release.patch
           else
             git apply swift-android-ci-except-release.patch swift-android-testing-except-release.patch
@@ -153,9 +153,10 @@ jobs:
             SDK=`pwd`/$SDK_NAME
             if [ ${{ matrix.version }} = 'trunk' ]; then
               cp $SDK/usr/include/execinfo.h $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include
+              export SWIFTPM_NO_SWBUILD_DEPENDENCY=1
             fi
 
-            ./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 --build-swift-tools=0 --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 $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 --build-swift-tools=0 --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 $LSP_BUILD
 
             rm $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift
 

get-packages-and-swift-source.swift

@@ -285,12 +285,14 @@ for repo in swiftRepos {
 if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
   for repo in extraSwiftRepos {
     if !fmd.fileExists(atPath: cwd.appendingPathComponent(renameRepos[repo] ?? repo)) {
-      let tag = repoTags[repo] ?? SWIFT_TAG
+      var tag = repoTags[repo] ?? SWIFT_TAG
       var repoOrg = "swiftlang"
       if repo == "Yams" {
         repoOrg = "jpsim"
       } else if appleRepos.contains(repo) {
         repoOrg = "apple"
+      } else if swiftVersion == "" && repo == "sourcekit-lsp" {
+        tag = "swift-DEVELOPMENT-SNAPSHOT-2025-03-28-a"
       }
       _ = runCommand("curl", with: ["-f", "-L", "-O",
                 "https://github.com/\(repoOrg)/\(repo)/archive/refs/tags/\(tag).tar.gz"])

swift-android-ci-except-release.patch

@@ -1,32 +1,12 @@
-diff --git a/sourcekit-lsp/Utilities/build-script-helper.py b/sourcekit-lsp/Utilities/build-script-helper.py
-index 88141cdd..d264f10c 100755
---- a/sourcekit-lsp/Utilities/build-script-helper.py
-+++ b/sourcekit-lsp/Utilities/build-script-helper.py
-@@ -136,9 +136,6 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace, suppress_verb
-     if '-android' in build_target:
-         swiftpm_args += [
-             '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
-+            '-Xlinker', '-landroid-spawn',
--            # SwiftPM will otherwise try to compile against GNU strerror_r on
--            '-Xlinker', '-landroid-spawn',
--            # Android and fail.
--            '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
-         ]
-     elif not build_os.startswith('macosx'):
-         # Library rpath for swift, dispatch, Foundation, etc. when installing
 diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
 index 156bf002a..d891da556 100755
 --- a/swiftpm/Utilities/bootstrap
 +++ b/swiftpm/Utilities/bootstrap
-@@ -934,10 +934,7 @@ def get_swiftpm_flags(args):
-         build_flags.extend(["-Xcc", "-I/usr/local/include"])
-         build_flags.extend(["-Xlinker", "-L/usr/local/lib"])
- 
--    # Don't use GNU strerror_r on Android.
--    if '-android' in args.build_target:
--        build_flags.extend(["-Xswiftc", "-Xcc", "-Xswiftc", "-U_GNU_SOURCE"])
--        build_flags.extend(["-Xlinker", "-landroid-spawn"])
-+    build_flags.extend(["-Xlinker", "-landroid-spawn"])
- 
-     cross_compile_hosts = args.cross_compile_hosts
-     if cross_compile_hosts:
+@@ -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)