Skip to content

bring back #7002 #7039

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.

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

Merged
merged 1 commit into from
Oct 26, 2023
Merged

bring back #7002 #7039

merged 1 commit into from
Oct 26, 2023

Conversation

tomerd
Copy link
Contributor

@tomerd tomerd commented Oct 25, 2023

bring back #7002 which was reverted in #7031 and include the fix from #7034

…state

motivation: when changing between canonical dependency URLs SwiftPM over-caches and ignores changes in manifest until local cache is deleted. this can lead to auth issues when switching between https and ssh for example

changes:
* take into account URL scheme when comparing dependency locations
* always prefer root dependencies when computing preferred URLs
* when managed dependencies have an older / different URL from the one resolved, use the resolved one for the resolved file
* clean up call sites that compare dependecy location
* add and expand tests

rdar://105732543
rdar://117381924
@tomerd tomerd force-pushed the revert-7031-maxd/revert-location-comparison branch from cd7da60 to 3173a9e Compare October 25, 2023 23:44
@tomerd tomerd changed the title Revert "Revert "refine location comparison when pre-loading package (#7002)"" bring back #7002 Oct 25, 2023
@tomerd
Copy link
Contributor Author

tomerd commented Oct 25, 2023

@swift-ci test

@tomerd tomerd enabled auto-merge (squash) October 26, 2023 19:59
@tomerd tomerd merged commit dafbae5 into main Oct 26, 2023
@tomerd tomerd deleted the revert-7031-maxd/revert-location-comparison branch October 26, 2023 21:13
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.

2 participants