Bundler 2 [pre-release]: Detect bundler version to use when bundler 2 is available #3350
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
brrygrdn
commented
Mar 25, 2021
feelepxyz
reviewed
Mar 25, 2021
bundler/spec/dependabot/bundler/update_checker/conflicting_dependency_resolver_spec.rb
Outdated
Show resolved
Hide resolved
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
from
68dac8d
to
fd3d377
Compare
|
Odd, I didn't expect |
Merged
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
from
a4f321d
to
7cd7e2a
Compare
|
The only things failing on this PR now should be a handful of tests in the bundler2 build which aren't using project-based fixtures. Since that will make them easy to find, my plan is a follow up commit which fixes this we can optionally cherry-pick unto the main branch. Almost there! |
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
5 times, most recently
from
6b37a01
to
43e67eb
Compare
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
3 times, most recently
from
4fbfaec
to
e481dec
Compare
This was referenced Mar 29, 2021
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
from
839bcd3
to
a5c57ce
Compare
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
from
a5c57ce
to
b75d941
Compare
brrygrdn
changed the base branch from
main
to
brrygrdn/test-bundler2-with-separate-fixtures
brrygrdn
changed the title
brrygrdn
commented
Mar 30, 2021
| @@ -11,7 +11,7 @@ | |||
|
|
|||
| require "functions" | |||
|
|
|||
| MIN_BUNDLER_VERSION = "2.0.0" | |||
| MIN_BUNDLER_VERSION = "2.1.0" | |||
There was a problem hiding this comment.
We actually rely on the Bundler v2.1.0 API for Bundler::URI, which was private in 2.0.x
brrygrdn
force-pushed
the
brrygrdn/test-bundler2-with-separate-fixtures
branch
from
6a4290b
to
332c3e0
Compare
brrygrdn
force-pushed
the
brrygrdn/detect-bundler-version
branch
from
b75d941
to
df1080b
Compare
Base automatically changed from
brrygrdn/test-bundler2-with-separate-fixtures
to
main
March 30, 2021 13:37
|
🎉 Looks like all bundler tests are ✅ I would probably just merge and start the release over waiting for python to complete 👌 |
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.
Depends on #3406
This modifies the
bundler_2_availableoption so it no longer forces use of the bundler 2 native helpers but rather decides based on the lockfile if present.The primary change is to expand and test the
Dependabot::Bundler::Helperto clearly specify scenarios such as defaulting to the newest when no Lockfile is present and failing over to v1 if a file is present but appears to pre-date theBUNDLED_WITHnotation.This also clarifies how Dependabot will behave if a new/malformed Gemfile.lock version were to appear.