Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.9] Fix macOS build issues #419

Merged
merged 2 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Tests/TSCBasicTests/ProcessTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -466,12 +466,7 @@ class ProcessTests: XCTestCase {

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

private static func script(_ name: String) -> String {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import sys

Expand Down
2 changes: 1 addition & 1 deletion Tests/TSCBasicTests/processInputs/in-to-out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import sys

Expand Down
2 changes: 1 addition & 1 deletion Tests/TSCBasicTests/processInputs/long-stdout-stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import sys

Expand Down
2 changes: 1 addition & 1 deletion Tests/TSCBasicTests/processInputs/simple-stdout-stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import sys

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"object": {
"pins": [
]
},
"version": 1
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redundant?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We previously saw build failures without it, IIRC @neonichu already committed this on main?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yea, I was hoping we did not need this workaround. @neonichu ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do until we install a new Xcode that doesn't suffer from the problem. I haven't investigated which versions specifically hit the problem, but wasn't able to reproduce with the current release.