Skip to content

Commit ceb48b5

Browse files
authored
Merge pull request #1315 from neonichu/use-aligned-branches
Use aligned branches for dependencies
2 parents dfd9940 + a286cf1 commit ceb48b5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ let package = Package(
137137
if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
138138
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
139139
package.dependencies += [
140-
.package(url: "https://github.com/apple/swift-llbuild.git", .branch("main")),
140+
.package(url: "https://github.com/apple/swift-llbuild.git", .branch("release/5.9")),
141141
]
142142
package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [
143143
.product(name: "llbuildSwift", package: "swift-llbuild"),
@@ -156,7 +156,7 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
156156

157157
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
158158
package.dependencies += [
159-
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("main")),
159+
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("release/5.9")),
160160
.package(url: "https://github.com/jpsim/Yams.git", .upToNextMinor(from: "5.0.0")),
161161
// The 'swift-argument-parser' version declared here must match that
162162
// used by 'swift-package-manager' and 'sourcekit-lsp'. Please coordinate

0 commit comments

Comments
 (0)