Skip to content

Commit a680677

Browse files
committed
Disable optional unwrapping in upcoming 6.1 devel branch too on the CI
1 parent 5393c3c commit a680677

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
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 swift-android-foundation-trunk.patch
141+
git apply swift-android-testing-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-except-release.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,15 @@ index 758dd1df..02970992 100644
6262
if !useFallbackChdir {
6363
try _throwIfPosixError(chdirResult)
6464
}
65+
@@ -944,7 +944,7 @@ open class Process: NSObject, @unchecked Sendable {
66+
var spawnAttrs: posix_spawnattr_t = posix_spawnattr_t()
67+
#endif
68+
try _throwIfPosixError(posix_spawnattr_init(&spawnAttrs))
69+
-#if os(Android)
70+
+#if os(Windows)
71+
guard var spawnAttrs else {
72+
throw NSError(domain: NSPOSIXErrorDomain, code: Int(errno),
73+
userInfo: [NSURLErrorKey:self.executableURL!])
6574
diff --git a/swift-testing/CMakeLists.txt b/swift-testing/CMakeLists.txt
6675
index 1be9a4b..bd7b1bd 100644
6776
--- a/swift-testing/CMakeLists.txt

swift-android-foundation-trunk.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)