Fix musl platform not being added to the lockfile #7441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
segiddins
reviewed
Jan 31, 2024
| end | ||
| end | ||
|
|
||
| it "does not add current platform if there's a more specific one already locked" do |
There was a problem hiding this comment.
this looks like a less specific platform is locked?
There was a problem hiding this comment.
Yeah, I did not explain this case correctly. In order to avoid too many platforms from being locked (case of x86_64-darwin-18, x86_64-darwin-19, x86_64-darwin-20, etc), I made it so that if one of the resolved platforms (say, x86_64-darwin) is compatible with the current platform but less specific, then we we'll keep that and don't add the current specific platform. I will reword it to make it clear!
deivid-rodriguez
force-pushed
the
deivid-rodriguez/musl
branch
2 times, most recently
from
1f1579c to
0bfabf5
Compare
deivid-rodriguez
force-pushed
the
deivid-rodriguez/musl
branch
from
0bfabf5 to
235f7b4
Compare
segiddins
approved these changes
Jan 31, 2024
|
@deivid-rodriguez Thanks so much for fixing this! ❤️ |
This comment was marked as spam.
This comment was marked as spam.
deivid-rodriguez
added a commit
that referenced
this pull request
Feb 5, 2024
Fix musl platform not being added to the lockfile (cherry picked from commit 10ac625)
19 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was the end-user or developer problem that led to this PR?
Since Bundler 2.5.0, we automatically lock all possible "RUBY" platforms (not windows, not java) where the resolve we found for the current platform is also valid.
I added some code though to avoid locking too many platforms in darwin, where no platform specific gems for each darwin version are release, so it's enough to lock
x86_64-darwinrather than the exact running platform (things likex86_64-darwin-19).However, this code had a bug where the current platform would also be incorrectly removed when it's
x86_64-linux-musl.What is your fix for the problem, implemented in this PR?
Musl support in RubyGems introduced an exception in
Gem::Platform#===commutativity and turns out the order should be the opposite to the one I was using to not get this case wrong.Fixes #7432.
Make sure the following tasks are checked