Skip to content

Commit e433d6d

Browse files
[5.9] Fix macOS build issues (#419)
* Potential workaround for a CI issue (#404) * Potential workaround for a CI issue The macOS CI does not seem to work with Xcode 14.2 as superior, hitting ``` error: Error Domain=NSCocoaErrorDomain Code=4 "The file "swiftpm" doesn't exist." UserInfo={NSFilePath=/Users/ec2-user/jenkins/workspace/pr-swift-tools-support-core-macos/branch-main/swift-tools-support-core/Utilities/ci.xcworkspace/xcshareddata/swiftpm, NSUnderlyingError=0x600000a5a310 {Error Domain=NSPOSIXErrorDomain Code=2 "No such file or directory"}} ``` I have a theory that this is triggered by us using a workspace that does not contain a resolved file, but that case works for me with SwiftPM 5.9 locally, so not sure. * Use python 3 macOS 12 comes with updated python. * Try empty resolved file (#417) We only added the resolved file as a workaround, we may not need any concrete pins for that. --------- Co-authored-by: Boris Bügling <[email protected]>
1 parent cab96f6 commit e433d6d

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

Tests/TSCBasicTests/ProcessTests.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,12 +466,7 @@ class ProcessTests: XCTestCase {
466466

467467
fileprivate extension Process {
468468
private static func env() -> [String:String] {
469-
var env = ProcessEnv.vars
470-
#if os(macOS)
471-
// Many of these tests use Python which might not be in the default `PATH` when running these tests from Xcode.
472-
env["PATH"] = "\(env["PATH"] ?? ""):/usr/local/bin"
473-
#endif
474-
return env
469+
return ProcessEnv.vars
475470
}
476471

477472
private static func script(_ name: String) -> String {

Tests/TSCBasicTests/processInputs/deadlock-if-blocking-io

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
import sys
44

Tests/TSCBasicTests/processInputs/in-to-out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
import sys
44

Tests/TSCBasicTests/processInputs/long-stdout-stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
import sys
44

Tests/TSCBasicTests/processInputs/simple-stdout-stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
import sys
44

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"object": {
3+
"pins": [
4+
]
5+
},
6+
"version": 1
7+
}

0 commit comments

Comments
 (0)