Skip to content

Upgrade Bundler to 2.3.22 #5509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffwidman merged 5 commits into from
Oct 5, 2022
Merged

Upgrade Bundler to 2.3.22 #5509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2154445
Remove stuff that has not been needed for a while
deivid-rodriguez Aug 10, 2022
711066a
Special case Bundler earlier
deivid-rodriguez Aug 10, 2022
c477310
Upgrade Bundler to 2.3.21
deivid-rodriguez Aug 10, 2022
2f87404
Remove no longer necessary monkeypatch
deivid-rodriguez Aug 24, 2022
b424345
Upgrade Bundler to 2.3.22
deivid-rodriguez Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ARG RUBY_INSTALL_VERSION=0.8.3
ARG RUBYGEMS_SYSTEM_VERSION=3.2.20

ARG BUNDLER_V1_VERSION=1.17.3
ARG BUNDLER_V2_VERSION=2.3.14
ARG BUNDLER_V2_VERSION=2.3.22
ENV BUNDLE_SILENCE_ROOT_WARNING=1
# Allow gem installs as the dependabot user
ENV BUNDLE_PATH=".bundle" \
Expand Down
10 changes: 5 additions & 5 deletions bundler/helpers/v2/lib/functions/version_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ def initialize(dependency_name:, dependency_requirements:,
end

def version_details
# If the dependency is Bundler itself then we can't trust the
# version that has been returned (it's the version Dependabot is
# running on, rather than the true latest resolvable version).
return nil if dependency_name == "bundler"

dep = dependency_from_definition

# If the dependency wasn't found in the definition, but *is*
Expand All @@ -28,11 +33,6 @@ def version_details
# subdependency that was removed when attempting to update it.
return nil if dep.nil?

# If the dependency is Bundler itself then we can't trust the
# version that has been returned (it's the version Dependabot is
# running on, rather than the true latest resolvable version).
return nil if dep.name == "bundler"

details = {
version: dep.version,
ruby_version: ruby_version,
Expand Down
15 changes: 0 additions & 15 deletions bundler/helpers/v2/monkey_patches/endpoint_specification_patch.rb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion bundler/helpers/v2/run.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# Bundler monkey patches
require "definition_ruby_version_patch"
require "definition_bundler_version_patch"
require "endpoint_specification_patch"
require "git_source_patch"

require "functions"
Expand Down
6 changes: 0 additions & 6 deletions bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
end
let(:source) { nil }
let(:requirement_string) { ">= 0" }
let(:rubygems_url) { "https://index.rubygems.org/api/v1/" }

describe "#latest_resolvable_version_details" do
subject { resolver.latest_resolvable_version_details }
Expand Down Expand Up @@ -142,11 +141,6 @@

let(:dependency_files) { bundler_project_dependency_files("bundler_specified") }

before do
stub_request(:get, rubygems_url + "versions/bundler.json").
to_return(status: 200, body: fixture("rubygems_responses", "versions-bundler.json"))
end

it "returns nil as resolution returns the bundler version installed by core" do
expect(subject).to be_nil
end
Expand Down