From 836e1908eac6d65441a5835845ec651d3b0e9752 Mon Sep 17 00:00:00 2001 From: jakecoffman Date: Thu, 12 May 2022 10:55:22 -0500 Subject: [PATCH] bundler: upgrade to 2.3.13 to fix rubygems/rubygems#5492 --- Dockerfile | 2 +- bundler/helpers/v2/build | 6 +++--- bundler/lib/dependabot/bundler/helpers.rb | 2 +- bundler/script/ci-test | 4 ++-- bundler/spec/dependabot/bundler/helper_spec.rb | 2 +- bundler/spec/spec_helper.rb | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fecb47c74e..dad88f2fee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,7 @@ RUN apt-add-repository ppa:brightbox/ruby-ng \ && apt-get install -y --no-install-recommends ruby2.7 ruby2.7-dev \ && gem update --system 3.2.20 \ && gem install bundler -v 1.17.3 --no-document \ - && gem install bundler -v 2.3.12 --no-document \ + && gem install bundler -v 2.3.13 --no-document \ && rm -rf /var/lib/gems/2.7.0/cache/* \ && rm -rf /var/lib/apt/lists/* diff --git a/bundler/helpers/v2/build b/bundler/helpers/v2/build index 5762a14abc8..1cdefbd31b8 100755 --- a/bundler/helpers/v2/build +++ b/bundler/helpers/v2/build @@ -22,6 +22,6 @@ cd "$install_dir" # NOTE: Sets `BUNDLED WITH` to match the installed v2 version in Gemfile.lock # forcing specs and native helpers to run with the same version -BUNDLER_VERSION=2.3.12 bundle config --local path ".bundle" -BUNDLER_VERSION=2.3.12 bundle config --local without "test" -BUNDLER_VERSION=2.3.12 bundle install +BUNDLER_VERSION=2.3.13 bundle config --local path ".bundle" +BUNDLER_VERSION=2.3.13 bundle config --local without "test" +BUNDLER_VERSION=2.3.13 bundle install diff --git a/bundler/lib/dependabot/bundler/helpers.rb b/bundler/lib/dependabot/bundler/helpers.rb index e9fcc2c6ee1..744a611b922 100644 --- a/bundler/lib/dependabot/bundler/helpers.rb +++ b/bundler/lib/dependabot/bundler/helpers.rb @@ -4,7 +4,7 @@ module Dependabot module Bundler module Helpers V1 = "1.17.3" - V2 = "2.3.12" + V2 = "2.3.13" # If we are updating a project with no Gemfile.lock, we default to the # newest version we support DEFAULT = V2 diff --git a/bundler/script/ci-test b/bundler/script/ci-test index dba5e762295..be409c3529b 100755 --- a/bundler/script/ci-test +++ b/bundler/script/ci-test @@ -15,7 +15,7 @@ fi if [[ "$SUITE_NAME" == "bundler2" ]]; then cd helpers/v2 \ - && BUNDLER_VERSION=2.3.12 bundle install \ - && BUNDLER_VERSION=2.3.12 bundle exec rspec spec \ + && BUNDLER_VERSION=2.3.13 bundle install \ + && BUNDLER_VERSION=2.3.13 bundle exec rspec spec \ && cd - fi diff --git a/bundler/spec/dependabot/bundler/helper_spec.rb b/bundler/spec/dependabot/bundler/helper_spec.rb index 0697d46f7c2..60a845defcc 100644 --- a/bundler/spec/dependabot/bundler/helper_spec.rb +++ b/bundler/spec/dependabot/bundler/helper_spec.rb @@ -41,7 +41,7 @@ end let(:v1) { "1.17.3" } - let(:v2) { "2.3.12" } + let(:v2) { "2.3.13" } describe "#bundler_version" do def described_method(lockfile) diff --git a/bundler/spec/spec_helper.rb b/bundler/spec/spec_helper.rb index 23df38d61f8..7f8f79fd84a 100644 --- a/bundler/spec/spec_helper.rb +++ b/bundler/spec/spec_helper.rb @@ -20,7 +20,7 @@ def self.use_bundler_2? end def self.bundler_version - use_bundler_2? ? "2.3.12" : "1.17.3" + use_bundler_2? ? "2.3.13" : "1.17.3" end def self.bundler_major_version