Skip to content

Commit

Permalink
Upgrade bundler to 2.4.17 (#1564)
Browse files Browse the repository at this point in the history
* Upgrade bundler to 2.4.17

* Upgrade bundler vesrion for CI

* Update gemfile.lock in dummy app
  • Loading branch information
ahangarha authored Jul 25, 2023
1 parent 9806310 commit 16a4c7d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ aliases:
- &install-dummy-app-ruby-gems
name: Install Ruby Gems for dummy app
command: |
gem install bundler:2.4.9
gem install bundler:2.4.17
echo "Bundler version: "; bundle --version
cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
# Install ruby gems unless existing set of gems is satisfying bundler.
- &install-package-ruby-gems
name: Install Ruby Gems for package
command: |
gem install bundler:2.4.9
gem install bundler:2.4.17
echo "Bundler version: "; bundle --version
bundle lock --add-platform 'x86_64-linux'
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-js-and-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.4.9
bundler: 2.4.17
- name: Setup Node
uses: actions/setup-node@v2-beta
with:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
yarn run eslint -v
sudo yarn global add yalc
- name: Install Ruby Gems for package
run: bundle check --path=vendor/bundle || bundle _2.4.9_ install --path=vendor/bundle --jobs=4 --retry=3
run: bundle check --path=vendor/bundle || bundle _2.4.17_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Linting of Ruby
run: bundle exec rubocop
- name: Linting of JS
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.4.9
bundler: 2.4.17
# libyaml-dev is needed for psych v5
# this gem depends on sdoc which depends on rdoc which depends on psych
- name: Fix dependency for libyaml-dev
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
path: spec/dummy/vendor/bundle
key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
- name: Install Ruby Gems for dummy app
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.9_ install --path=vendor/bundle --jobs=4 --retry=3
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.17_ install --path=vendor/bundle --jobs=4 --retry=3
- name: generate file system-based packs
run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
- name: Build test bundles for dummy app
Expand All @@ -87,7 +87,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.4.9
bundler: 2.4.17
- name: Setup Node
uses: actions/setup-node@v2-beta
with:
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- name: Install Ruby Gems for package
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
- name: Install Ruby Gems for dummy app
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.9_ install --path=vendor/bundle --jobs=4 --retry=3
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.17_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Ensure minimum required Chrome version
run: |
echo -e "Already installed $(google-chrome --version)\n"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rspec-package-specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.4.9
bundler: 2.4.17
- name: Print system information
run: |
echo "Linux release: "; cat /etc/issue
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.development_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "sass-rails", "~> 6.0"
gem "uglifier"
gem "jquery-rails"
gem "puma", "~> 5.0"
gem "bundler", "2.4.9"
gem "bundler", "2.4.17"

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?
Expand Down
4 changes: 2 additions & 2 deletions spec/dummy/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ PLATFORMS
DEPENDENCIES
amazing_print
bootsnap
bundler (= 2.4.9)
bundler (= 2.4.17)
capybara
capybara-screenshot
coveralls
Expand Down Expand Up @@ -350,4 +350,4 @@ DEPENDENCIES
uglifier

BUNDLED WITH
2.4.9
2.4.17

0 comments on commit 16a4c7d

Please sign in to comment.