Fix musl platform not being added to the lockfile #7441
Merged
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-darwin
rather 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