Skip to content

Conversation

MaxDesiatov
Copy link
Contributor

@MaxDesiatov MaxDesiatov commented Dec 8, 2021

Motivation:

Tools depending on release/5.6 branch of SwiftPM together with release/5.6 branch of TSC fail to build due to conflicting dependencies.

Modifications:

relatedDependenciesBranch now is set to release/5.6 instead of main when SwiftPM release/5.6 branch is checked out. This makes dependencies consistent and resolvable when other Swift tools are included in the dependency tree.

Result:

Tools depending on release/5.6 branch of SwiftPM can be built without failures.

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test

@MaxDesiatov MaxDesiatov changed the title Set relatedDependenciesBranch to release/5.6 [5.6] Set relatedDependenciesBranch to release/5.6 Dec 8, 2021
@abertelrud
Copy link
Contributor

abertelrud commented Dec 8, 2021

Thanks @MaxDesiatov. Also opened a corresponding one on swift-driver since local builds will fail otherwise: swiftlang/swift-driver#929

@abertelrud
Copy link
Contributor

Will mark approved once the swift-driver change is in so local desktop use doesn't break. Thanks for this fix @MaxDesiatov!

@abertelrud
Copy link
Contributor

Still waiting for there to be a 5.6 toolchain so that we can merge the SwiftDriver change. Otherwise all non-CI builds of SwiftPM will start failing when we merge this.

@abertelrud
Copy link
Contributor

Update: since there's no 5.6 toolchain yet, and therefore swiftlang/swift-driver#929 is blocked from merging, I ran a cross-repo test using an empty-commit PR in the Swift compiler repo (swiftlang/swift#40613). That seems to have succeeded, which means that we should be able to merge swiftlang/swift-driver#929 soon and then this one after that.

@abertelrud abertelrud self-assigned this Jan 3, 2022
@abertelrud
Copy link
Contributor

Update: Still trying to get the swift-driver change in, otherwise desktop builds of SwiftPM will start failing once this is merged.

@abertelrud
Copy link
Contributor

The SwiftDriver change has been merged, so I will do a local test to confirm that this is now fixed, and then merge it.

@abertelrud
Copy link
Contributor

With the latest change to SwiftDriver (swiftlang/swift-driver#964), this looks good now for local builds as well. I think we just need @tomerd's approval now for the 5.6 branch.

@abertelrud abertelrud merged commit 1dac3eb into release/5.6 Jan 5, 2022
@MaxDesiatov MaxDesiatov deleted the maxd/package-manifest-5.6 branch February 7, 2022 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants