Fix incorrect ruby platform removal from lockfile when adding Gemfile dependencies #6540
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
deivid-rodriguez
force-pushed
the
fix-incorrect-ruby-platform-removal
branch
from
9b06608
to
738f05b
Compare
When dependencies have changed, we'll be re-resolving, and we can't really know whether the resolution will be valid or invalid for the Ruby platform, so skip the removal in that case. The fix worked, but made some other specs fail, and surfaced that the `@dependencies_changed` attribute was actually being incorrect set when explicitly unlocking. Fixed that with an early return.
deivid-rodriguez
force-pushed
the
fix-incorrect-ruby-platform-removal
branch
from
738f05b
to
20d8f5e
Compare
simi
approved these changes
Mar 24, 2023
deivid-rodriguez
pushed a commit
that referenced
this pull request
Mar 24, 2023
…moval Fix incorrect ruby platform removal from lockfile when adding Gemfile dependencies (cherry picked from commit db67560)
Merged
4 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?
When adding a new Gemfile dependencies, we're incorrectly replacing the RUBY platform with the locked platform in the lockfile.
What is your fix for the problem, implemented in this PR?
Skip the removal of the RUBY platform when dependencies have changed.
Fixes #6536.
Make sure the following tasks are checked