Ad-hoc fix for platform regression #4127
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
specific_platform_regression
branch
2 times, most recently
from
f27df1e
to
2cfbe9d
Compare
This was referenced Dec 11, 2020
deivid-rodriguez
force-pushed
the
specific_platform_regression
branch
from
fea47ce
to
614e13f
Compare
simi
reviewed
Dec 12, 2020
simi
approved these changes
Dec 12, 2020
|
Unfortunately all regressions in 2.2.0 have been caused by #4015, so I'm considering full revert of that as an alternative to this PR, since I don't currently have a solution for #4128. So let me investigate a bit more this weekend and we can release patch level versions on Monday with either approach. Does that sound good? |
deivid-rodriguez
force-pushed
the
specific_platform_regression
branch
2 times, most recently
from
ac6efa2
to
467c43a
Compare
simi
approved these changes
Dec 14, 2020
deivid-rodriguez
force-pushed
the
specific_platform_regression
branch
from
467c43a
to
2a18ec7
Compare
We should be able to remove this once we have proper bundler version switching.
deivid-rodriguez
force-pushed
the
specific_platform_regression
branch
from
2a18ec7
to
6ebb0e3
Compare
deivid-rodriguez
added a commit
that referenced
this pull request
Dec 14, 2020
Ad-hoc fix for platform regression (cherry picked from commit 6a8791c)
mokagio
added a commit
to Automattic/simplenote-ios
that referenced
this pull request
Dec 16, 2020
2.2.1 has a fix for some platform specific stuff which seems worth adopting ASAP: rubygems/rubygems#4127
3 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?
In bundler 2.2 we switched to a "strict platform materialization". That means that the exact resolution, including the platform specific gems resolved for each specific platform, and the specific platforms themselves are now recorded in the lockfile.
Previously, the resolution was done without considering platform specific variants at all, and then at install time, a platform specific version for the resolved version would be installed if it happens to exist.
With the fixed behaviour though, if we are materializing a lock file created with an old bundler version, the new bundler version will interpret that the pure ruby version was resolved (since that's what it finds in the lock file) and try to materialize that. However, that version doesn't really exist in the system (it's the platform specific variant that got installed).
This change should restore backwards compatibility in this regard.
What is your fix for the problem, implemented in this PR?
My fix is to check the version of bundler present in the lock file (if it exists), which indicates the version of bundler that created it. If that version is prior to 2.2.0, we fallback to the old behaviour.
We should be able to remove this once we have proper bundler version switching.
Fixes #4123.
Fixes #4122 too, I think.
Make sure the following tasks are checked