Skip to content

Potential workaround for a CI issue #404

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 13, 2023
Merged

Potential workaround for a CI issue #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b69b6cb
Potential workaround for a CI issue
neonichu Apr 13, 2023
e5becf9
Use python 3
neonichu Apr 13, 2023
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Tests/TSCBasicTests/processInputs/deadlock-if-blocking-io
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
79 changes: 79 additions & 0 deletions Utilities/ci.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this file required to be committed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yah, we need it to avoid

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 haven't looked deeply into why that is, I wasn't able to reproduce locally. My theory is that there was an issue in Xcode 14.2 / SwiftPM 5.7 that we maybe never found but accidentally fixed in 5.8 or 5.9.

Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"object": {
"pins": [
{
"package": "IndexStoreDB",
"repositoryURL": "https://github.com/apple/indexstore-db.git",
"state": {
"branch": "main",
"revision": "89ec16c2ac1bb271614e734a2ee792224809eb20",
"version": null
}
},
{
"package": "swift-asn1",
"repositoryURL": "https://github.com/apple/swift-asn1.git",
"state": {
"branch": null,
"revision": "805deae27a7506dcad043604c00a9dc52d465dcb",
"version": "0.7.0"
}
},
{
"package": "swift-certificates",
"repositoryURL": "https://github.com/apple/swift-certificates.git",
"state": {
"branch": null,
"revision": "54b9711034c0bd9b18f9ac0fb262d493130bcf13",
"version": "0.1.0"
}
},
{
"package": "swift-collections",
"repositoryURL": "https://github.com/apple/swift-collections.git",
"state": {
"branch": null,
"revision": "937e904258d22af6e447a0b72c0bc67583ef64a2",
"version": "1.0.4"
}
},
{
"package": "swift-crypto",
"repositoryURL": "https://github.com/apple/swift-crypto.git",
"state": {
"branch": null,
"revision": "da0fe44138ab86e380f40a2acbd8a611b07d3f64",
"version": "2.4.0"
}
},
{
"package": "llbuild",
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
"state": {
"branch": "main",
"revision": "4cc1ea448e236c2f4dfe622cec786bce4bd56c45",
"version": null
}
},
{
"package": "SwiftSyntax",
"repositoryURL": "https://github.com/apple/swift-syntax.git",
"state": {
"branch": "main",
"revision": "2d5575b8771c5ccd5673428d959085ddb74dbbf7",
"version": null
}
},
{
"package": "swift-system",
"repositoryURL": "https://github.com/apple/swift-system.git",
"state": {
"branch": null,
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
"version": "1.1.1"
}
}
]
},
"version": 1
}