Skip to content

Bump bundler from 2.3.13 to 2.3.17 #5362

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

Closed
jurre wants to merge 2 commits into from
Closed

Bump bundler from 2.3.13 to 2.3.17 #5362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf908c
Bump bundler from 2.3.13 to 2.3.17
jurre Jul 12, 2022
afb4390
Bump rubygems from 3.2.20 to 3.3.17
jurre Jul 12, 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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ ENV PATH="$BUNDLE_BIN:$PATH:$BUNDLE_PATH/bin"
RUN apt-add-repository ppa:brightbox/ruby-ng \
&& apt-get update \
&& apt-get install -y --no-install-recommends ruby2.7 ruby2.7-dev \
&& gem update --system 3.2.20 \
&& gem update --system 3.3.17 \
&& gem install bundler -v 1.17.3 --no-document \
&& gem install bundler -v 2.3.13 --no-document \
&& gem install bundler -v 2.3.17 --no-document \
&& rm -rf /var/lib/gems/2.7.0/cache/* \
&& rm -rf /var/lib/apt/lists/*

Expand Down
6 changes: 3 additions & 3 deletions bundler/helpers/v2/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.13 bundle config --local path ".bundle"
BUNDLER_VERSION=2.3.13 bundle config --local without "test"
BUNDLER_VERSION=2.3.13 bundle install
BUNDLER_VERSION=2.3.17 bundle config --local path ".bundle"
BUNDLER_VERSION=2.3.17 bundle config --local without "test"
BUNDLER_VERSION=2.3.17 bundle install
2 changes: 1 addition & 1 deletion bundler/lib/dependabot/bundler/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Dependabot
module Bundler
module Helpers
V1 = "1.17.3"
V2 = "2.3.13"
V2 = "2.3.17"
# If we are updating a project with no Gemfile.lock, we default to the
# newest version we support
DEFAULT = V2
Expand Down
4 changes: 2 additions & 2 deletions bundler/script/ci-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi

if [[ "$SUITE_NAME" == "bundler2" ]]; then
cd helpers/v2 \
&& BUNDLER_VERSION=2.3.13 bundle install \
&& BUNDLER_VERSION=2.3.13 bundle exec rspec spec \
&& BUNDLER_VERSION=2.3.17 bundle install \
&& BUNDLER_VERSION=2.3.17 bundle exec rspec spec \
&& cd -
fi
2 changes: 1 addition & 1 deletion bundler/spec/dependabot/bundler/helper_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
end

let(:v1) { "1.17.3" }
let(:v2) { "2.3.13" }
let(:v2) { "2.3.17" }

describe "#bundler_version" do
def described_method(lockfile)
Expand Down
2 changes: 1 addition & 1 deletion bundler/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def self.use_bundler_2?
end

def self.bundler_version
use_bundler_2? ? "2.3.13" : "1.17.3"
use_bundler_2? ? "2.3.17" : "1.17.3"
end

def self.bundler_major_version
Expand Down