Fix trunk build and update swift-collections on CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -110,8 +110,12 @@ jobs:
           git apply swift-android.patch swift-android-ci.patch swift-android-both-ndks.patch
           if [ ${{ matrix.version }} != 'trunk' ]; then
             git apply swift-android-tsc.patch swift-android-both-ndks-except-trunk.patch
+            STUPID_FILE_RENAMING=Tool
           else
+            sed -i "s%r26%ndk/26%" swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
+            sed -i "s%getdtablesize()%Int32(sysconf(_SC_OPEN_MAX))%" swiftpm/Sources/Commands/SwiftRunCommand.swift
             git apply libdispatch-trunk.patch
+            STUPID_FILE_RENAMING=Command
           fi
           if [ ${{ matrix.ndk }} = '26c' ]; then
             NDK=$ANDROID_NDK_LATEST_HOME
@@ -124,7 +128,7 @@ jobs:
             sed -i "s%#include <time%#include <signal.h>\n#include <time%" swift-crypto/Sources/CCryptoBoringSSL/include/CCryptoBoringSSL_asn1.h
           fi
           sed -i "s%/data/data/com.termux/files%$SDK%" $SDK/usr/lib/pkgconfig/sqlite3.pc
-          sed -i "s%String(cString: getpass%\"fake\" //%" swiftpm/Sources/PackageRegistryTool/PackageRegistryTool+Auth.swift
+          sed -i "s%String(cString: getpass%\"fake\" //%" swiftpm/Sources/PackageRegistry$STUPID_FILE_RENAMING/PackageRegistry$STUPID_FILE_RENAMING+Auth.swift
 
           ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $NDK --android-arch ${{ matrix.arch }} --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=`pwd`/$SWIFT_TAG-ubuntu22.04/usr/bin --native-clang-tools-path=`pwd`/$SWIFT_TAG-ubuntu22.04/usr/bin --cross-compile-hosts=android-${{ matrix.arch }} --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --skip-early-swift-driver --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild --sourcekit-lsp --skip-early-swiftsyntax
 

get-packages-and-swift-source.swift

@@ -12,7 +12,7 @@ let extraSwiftRepos = ["swift-llbuild", "swift-package-manager", "swift-driver",
                        "Yams", "indexstore-db", "sourcekit-lsp", "swift-system",
                        "swift-collections", "swift-certificates", "swift-asn1"]
 let renameRepos = ["swift-llbuild" : "llbuild", "swift-package-manager" : "swiftpm", "Yams" : "yams"]
-var repoTags = ["swift-system" : "1.1.1", "swift-collections" : "1.0.1", "swift-asn1" : "1.0.0",
+var repoTags = ["swift-system" : "1.1.1", "swift-collections" : "1.0.5", "swift-asn1" : "1.0.0",
                 "swift-certificates" : "1.0.1", "Yams" : "5.0.1", "swift-argument-parser" : "1.2.3",
                 "swift-crypto" : "3.0.0"]
 if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
@@ -52,6 +52,7 @@ if swiftBranch == "RELEASE" {
   repoTags["swift-argument-parser"] = "1.2.2"
   repoTags["swift-asn1"] = "0.7.0"
   repoTags["swift-certificates"] = "0.4.1"
+  repoTags["swift-collections"] = "1.0.1"
   repoTags["swift-crypto"] = "2.5.0"
   sdkDir = "swift-release-android-\(ANDROID_ARCH)-24-sdk"
 } else {