Fix platform specific gems removed from the lockfile #6266
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
deivid-rodriguez
force-pushed
the
set-proper-resolve-mode-on-retries
branch
2 times, most recently
from
7b104f0
to
3e9483f
Compare
If we have a lockfile missing platform a specific gem for the current platform, and that gem happens to be already installed locally, then Bundler will initially try to use "local mode" and use the existing lockfile exclusively. But then when materializing it will realize that it's missing platform gems and try to re-resolve to fill them in. However, since we initially used "local mode", this resolution will only consider local gems and will result in gems for other platforms being lost. To fix this, we need to save the resolution mode in the definition early and make sure we set up sources using that mode before re-resolving.
deivid-rodriguez
force-pushed
the
set-proper-resolve-mode-on-retries
branch
from
3e9483f
to
e8bd10d
Compare
deivid-rodriguez
added a commit
that referenced
this pull request
Jan 13, 2023
…ries Fix platform specific gems removed from the lockfile (cherry picked from commit 47136c6)
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?
If we have a lockfile missing a specific gem for the current platform, and that gem happens to be already installed locally, then Bundler will initially try to use "local mode" and use the existing lockfile exclusively. But then when materializing it will realize that it's missing platform gems and try to re-resolve to fill them in. However, since we initially used "local mode", this resolution will only consider local gems and will result in gems for other platforms being lost.
What is your fix for the problem, implemented in this PR?
To fix this, we need to save the resolution mode in the definition early and make sure we set up sources using that mode before re-resolving.
Fixes #6263.
Make sure the following tasks are checked