Fix bundler/inline not resolving properly if gems not preinstalled
#6282
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-inline-issue
branch
3 times, most recently
from
ac013d8
to
3b84473
Compare
In inline mode, we resolve twice. First, we do a local resolution, and if that fails (either because local resolution failed, or because some resolved spec is not installed), we try again remotely. Due to a recent refactoring, we were eagerly passing source requirements for resolution to a resolution context that would be reused for both of the above resolutions. However, the source requirements are different in the above two modes, because local resolution uses a global aggregated source, instead of explicit sources for each name. The solution is to change local resolution to also use explicit source requirements.
deivid-rodriguez
force-pushed
the
fix-inline-issue
branch
from
3b84473
to
5cc752d
Compare
deivid-rodriguez
changed the title
bundler/inline
deivid-rodriguez
changed the title
bundler/inline not resolving properly if gems not preinstalled
|
I found a much simpler approach. Instead of lazily passing source requirements, so that each resolution uses the ones it needs, I made source requirements independent of whether we resolve locally or remotely. |
deivid-rodriguez
added a commit
that referenced
this pull request
Jan 21, 2023
Fix `bundler/inline` not resolving properly if gems not preinstalled (cherry picked from commit 633a968)
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?
After 2.4.4, some
bundler/inlinecases no longer work.What is your fix for the problem, implemented in this PR?
In inline mode, we resolve twice. First, we do a local resolution, and if that fails (local resolution failed, some resolved spec is not installed), we try again remotely.
Due to a recent refactoring, we were eagerly passing source requirements for resolution to a resolution context that would be reused for both of the above resolutions. However, the source requirements are different in the above two modes, so we need to make sure to calculate source requirements lazily when resolving.
However, that solution caused some issues with git sources, because it turns out during calculation of source requirements, we sort sources based on their
to_srepresentation, and calling#to_son git sources actually causes side effects: the displayed revision is memoized in the source. That was causing git sources to no longer be updated correctly. I changed this sorting of sources to not rely on#to_sto fix this derivated problem.Closes #6281.
Make sure the following tasks are checked