From 8847bb428f1b282d2ed81e6660a7b34e46755900 Mon Sep 17 00:00:00 2001 From: Rick van Voorden Date: Wed, 9 Jul 2025 13:20:47 -0700 Subject: [PATCH] package deps --- Package.swift | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Package.swift b/Package.swift index 560a10cf9..4586a4842 100644 --- a/Package.swift +++ b/Package.swift @@ -42,24 +42,33 @@ let featureSettings: [SwiftSetting] = [ .enableUpcomingFeature("MemberImportVisibility") ] -var dependencies: [Package.Dependency] { - if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] != nil { +var dependencies: [Package.Dependency] = [] + +if let useLocalDepsEnv = Context.environment["SWIFTCI_USE_LOCAL_DEPS"], !useLocalDepsEnv.isEmpty { + let root: String + if useLocalDepsEnv == "1" { + root = ".." + } else { + root = useLocalDepsEnv + } + dependencies += [ .package( name: "swift-collections", - path: "../swift-collections"), + path: "\(root)/swift-collections"), .package( name: "swift-foundation-icu", - path: "../swift-foundation-icu"), + path: "\(root)/swift-foundation-icu"), .package( name: "swift-syntax", - path: "../swift-syntax") + path: "\(root)/swift-syntax") ] - } else { +} else { + dependencies += [ .package( url: "https://github.com/apple/swift-collections", - from: "1.1.0"), + branch: "main"), .package( url: "https://github.com/apple/swift-foundation-icu", branch: "main"), @@ -67,7 +76,6 @@ var dependencies: [Package.Dependency] { url: "https://github.com/swiftlang/swift-syntax", branch: "main") ] - } } let wasiLibcCSettings: [CSetting] = [