Skip to content

[5.5] New disable automatic resolution alias #3708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 9, 2021
Merged

[5.5] New disable automatic resolution alias #3708

merged 1 commit into from
Sep 9, 2021

Conversation

neonichu
Copy link
Contributor

@neonichu neonichu commented Sep 2, 2021

5.5 cherry-pick of #3706

@neonichu
New name for "disable automatic resolution"
ee80491 
This adds a new alias for this flag and also updates the help text. Previous names of the flag will continue to work as well.

rdar://81961772
(cherry picked from commit 4af60f7)
@neonichu
Copy link
Contributor Author

neonichu commented Sep 2, 2021

@swift-ci please smoke test

@neonichu
Copy link
Contributor Author

neonichu commented Sep 3, 2021

/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-release/5.5/swiftpm/IntegrationTests/Tests/IntegrationTests/XCBuildTests.swift:228: error: -[IntegrationTests.XCBuildTests testLibraryProductsAndTargets] : failed - Command failed with exit code: terminated(code: 1) - command: >/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-release/5.5/swiftpm/.build/x86_64-apple-macosx/debug/swift-build --package-path /var/folders/_8/79jmzf2142z2xydc_01btlx00000gn/T/XCBuild_Libraries.lVmDn3/Foo --build-system xcode --target FooLib

Looks like we need to backport the workaround in the integration test suite to 5.5

@neonichu
Copy link
Contributor Author

neonichu commented Sep 3, 2021

I think instead of backporting the workaround, I'll implement an actual solution since we should fix the incompatibility with newer XCBuilds in a 5.5.x release if possible.

@abertelrud
Copy link
Contributor

@swift-ci please test

@neonichu
Copy link
Contributor Author

neonichu commented Sep 9, 2021

Failing test in self-hosted is being addressed separately and isn't required to merge this as we are running the full tests for the 5.5 branch.

@neonichu neonichu merged commit a3ae52c into release/5.5 Sep 9, 2021
@neonichu neonichu deleted the new-disable-automatic-resolution-alias branch September 9, 2021 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abertelrud abertelrud abertelrud approved these changes

@friedbunny friedbunny Awaiting requested review from friedbunny friedbunny is a code owner

@tomerd tomerd Awaiting requested review from tomerd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@neonichu @abertelrud