Skip to content

Commit 52cb792

Browse files
committed
Remove an optional unwrapping because this SDK bundle is built against the Termux
libandroid-spawn without nullability annotations on the CI
1 parent e074ac4 commit 52cb792

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.github/workflows/sdks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
LSP_BUILD="--sourcekit-lsp"
139139
git apply swift-android-testing-devel.patch
140140
else
141-
git apply swift-android-testing-trunk.patch
141+
git apply swift-android-testing-trunk.patch swift-android-foundation-trunk.patch
142142
fi
143143
TESTING_BUILD="--swift-testing --install-swift-testing"
144144
git apply swift-android-ci-except-release.patch swift-android-foundation-except-release.patch

swift-android-foundation-trunk.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/swift-corelibs-foundation/Sources/Foundation/Process.swift b/swift-corelibs-foundation/Sources/Foundation/Process.swift
2+
index 5ebcbd51..742d4baf 100644
3+
--- a/swift-corelibs-foundation/Sources/Foundation/Process.swift
4+
+++ b/swift-corelibs-foundation/Sources/Foundation/Process.swift
5+
@@ -944,7 +944,7 @@ open class Process: NSObject, @unchecked Sendable {
6+
var spawnAttrs: posix_spawnattr_t = posix_spawnattr_t()
7+
#endif
8+
try _throwIfPosixError(posix_spawnattr_init(&spawnAttrs))
9+
-#if os(Android)
10+
+#if os(Windows)
11+
guard var spawnAttrs else {
12+
throw NSError(domain: NSPOSIXErrorDomain, code: Int(errno),
13+
userInfo: [NSURLErrorKey:self.executableURL!])

0 commit comments

Comments
 (0)