Skip to content

Commit 5efa89e

Browse files
authored
update package deps for custom project root (#1412)
* package deps * checkout collections 1.1.0 * package deps comment
1 parent e268301 commit 5efa89e

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

Package.swift

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,31 @@ let featureSettings: [SwiftSetting] = [
4040
.enableUpcomingFeature("MemberImportVisibility")
4141
]
4242

43-
var dependencies: [Package.Dependency] {
44-
if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] != nil {
43+
var dependencies: [Package.Dependency] = []
44+
45+
if let useLocalDepsEnv = Context.environment["SWIFTCI_USE_LOCAL_DEPS"], !useLocalDepsEnv.isEmpty {
46+
let root: String
47+
if useLocalDepsEnv == "1" {
48+
root = ".."
49+
} else {
50+
root = useLocalDepsEnv
51+
}
52+
dependencies +=
4553
[
4654
.package(
4755
name: "swift-collections",
48-
path: "../swift-collections"),
56+
path: "\(root)/swift-collections"),
4957
.package(
5058
name: "swift-foundation-icu",
51-
path: "../swift-foundation-icu"),
59+
path: "\(root)/swift-foundation-icu"),
5260
.package(
5361
name: "swift-syntax",
54-
path: "../swift-syntax")
62+
path: "\(root)/swift-syntax")
5563
]
56-
} else {
64+
} else {
65+
// These dependencies should match `update-checkout`
66+
// See `update-checkout-config.json` for the `main` branch-scheme
67+
dependencies +=
5768
[
5869
.package(
5970
url: "https://github.com/apple/swift-collections",
@@ -65,7 +76,6 @@ var dependencies: [Package.Dependency] {
6576
url: "https://github.com/swiftlang/swift-syntax",
6677
branch: "main")
6778
]
68-
}
6979
}
7080

7181
let wasiLibcCSettings: [CSetting] = [

0 commit comments

Comments
 (0)