Skip to content

Commit 4d953b3

Browse files
neonichuMaxDesiatov
authored andcommitted
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.
1 parent cab96f6 commit 4d953b3

File tree

6 files changed

+84
-10
lines changed

6 files changed

+84
-10
lines changed

Tests/TSCBasicTests/ProcessTests.swift

+1-6
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"object": {
3+
"pins": [
4+
{
5+
"package": "IndexStoreDB",
6+
"repositoryURL": "https://github.com/apple/indexstore-db.git",
7+
"state": {
8+
"branch": "main",
9+
"revision": "89ec16c2ac1bb271614e734a2ee792224809eb20",
10+
"version": null
11+
}
12+
},
13+
{
14+
"package": "swift-asn1",
15+
"repositoryURL": "https://github.com/apple/swift-asn1.git",
16+
"state": {
17+
"branch": null,
18+
"revision": "805deae27a7506dcad043604c00a9dc52d465dcb",
19+
"version": "0.7.0"
20+
}
21+
},
22+
{
23+
"package": "swift-certificates",
24+
"repositoryURL": "https://github.com/apple/swift-certificates.git",
25+
"state": {
26+
"branch": null,
27+
"revision": "54b9711034c0bd9b18f9ac0fb262d493130bcf13",
28+
"version": "0.1.0"
29+
}
30+
},
31+
{
32+
"package": "swift-collections",
33+
"repositoryURL": "https://github.com/apple/swift-collections.git",
34+
"state": {
35+
"branch": null,
36+
"revision": "937e904258d22af6e447a0b72c0bc67583ef64a2",
37+
"version": "1.0.4"
38+
}
39+
},
40+
{
41+
"package": "swift-crypto",
42+
"repositoryURL": "https://github.com/apple/swift-crypto.git",
43+
"state": {
44+
"branch": null,
45+
"revision": "da0fe44138ab86e380f40a2acbd8a611b07d3f64",
46+
"version": "2.4.0"
47+
}
48+
},
49+
{
50+
"package": "llbuild",
51+
"repositoryURL": "https://github.com/apple/swift-llbuild.git",
52+
"state": {
53+
"branch": "main",
54+
"revision": "4cc1ea448e236c2f4dfe622cec786bce4bd56c45",
55+
"version": null
56+
}
57+
},
58+
{
59+
"package": "SwiftSyntax",
60+
"repositoryURL": "https://github.com/apple/swift-syntax.git",
61+
"state": {
62+
"branch": "main",
63+
"revision": "2d5575b8771c5ccd5673428d959085ddb74dbbf7",
64+
"version": null
65+
}
66+
},
67+
{
68+
"package": "swift-system",
69+
"repositoryURL": "https://github.com/apple/swift-system.git",
70+
"state": {
71+
"branch": null,
72+
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
73+
"version": "1.1.1"
74+
}
75+
}
76+
]
77+
},
78+
"version": 1
79+
}

0 commit comments

Comments
 (0)