Skip to content

Commit 0c9fb65

Browse files
authored
Switch to bundler 2.5.9 and commit top gemfile.lock (#1619)
* add top level Gemfile.lock
1 parent fef75be commit 0c9fb65

File tree

10 files changed

+450
-19
lines changed

10 files changed

+450
-19
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ aliases:
5454
- &install-dummy-app-ruby-gems
5555
name: Install Ruby Gems for dummy app
5656
command: |
57-
gem install bundler:2.5.3
57+
gem install bundler:2.5.9
5858
echo "Bundler version: "; bundle --version
5959
cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
6060
6161
# Install ruby gems unless existing set of gems is satisfying bundler.
6262
- &install-package-ruby-gems
6363
name: Install Ruby Gems for package
6464
command: |
65-
gem install bundler:2.5.3
65+
gem install bundler:2.5.9
6666
echo "Bundler version: "; bundle --version
6767
bundle lock --add-platform 'x86_64-linux'
6868
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3

.github/workflows/examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: ruby/setup-ruby@v1
2828
with:
2929
ruby-version: 3.3
30-
bundler: 2.5.3
30+
bundler: 2.5.9
3131
- name: Setup Node
3232
uses: actions/setup-node@v3
3333
with:
@@ -61,7 +61,7 @@ jobs:
6161
- name: yalc publish for react-on-rails
6262
run: yalc publish
6363
- name: Install Ruby Gems for package
64-
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
64+
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
6565
- name: Ensure minimum required Chrome version
6666
run: |
6767
echo -e "Already installed $(google-chrome --version)\n"

.github/workflows/lint-js-and-ruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: ruby/setup-ruby@v1
2323
with:
2424
ruby-version: ${{ matrix.ruby }}
25-
bundler: 2.5.3
25+
bundler: 2.5.9
2626
- name: Setup Node
2727
uses: actions/setup-node@v3
2828
with:
@@ -52,7 +52,7 @@ jobs:
5252
yarn run eslint -v
5353
sudo yarn global add yalc
5454
- name: Install Ruby Gems for package
55-
run: bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
55+
run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
5656
- name: Linting of Ruby
5757
run: bundle exec rubocop
5858
- name: Linting of JS

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: ruby/setup-ruby@v1
2222
with:
2323
ruby-version: ${{ matrix.ruby }}
24-
bundler: 2.5.3
24+
bundler: 2.5.9
2525
# libyaml-dev is needed for psych v5
2626
# this gem depends on sdoc which depends on rdoc which depends on psych
2727
- name: Fix dependency for libyaml-dev
@@ -66,7 +66,7 @@ jobs:
6666
path: spec/dummy/vendor/bundle
6767
key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
6868
- name: Install Ruby Gems for dummy app
69-
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
69+
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
7070
- name: generate file system-based packs
7171
run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
7272
- name: Build test bundles for dummy app
@@ -94,7 +94,7 @@ jobs:
9494
uses: ruby/setup-ruby@v1
9595
with:
9696
ruby-version: ${{ matrix.ruby }}
97-
bundler: 2.5.3
97+
bundler: 2.5.9
9898
- name: Setup Node
9999
uses: actions/setup-node@v3
100100
with:
@@ -145,9 +145,9 @@ jobs:
145145
- name: yalc add react-on-rails
146146
run: cd spec/dummy && yalc add react-on-rails
147147
- name: Install Ruby Gems for package
148-
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
148+
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
149149
- name: Install Ruby Gems for dummy app
150-
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
150+
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
151151
- name: Ensure minimum required Chrome version
152152
run: |
153153
echo -e "Already installed $(google-chrome --version)\n"

.github/workflows/rspec-package-specs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: ruby/setup-ruby@v1
2222
with:
2323
ruby-version: ${{ matrix.ruby }}
24-
bundler: 2.5.3
24+
bundler: 2.5.9
2525
- name: Print system information
2626
run: |
2727
echo "Linux release: "; cat /etc/issue
@@ -37,7 +37,7 @@ jobs:
3737
path: vendor/bundle
3838
key: v5-package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}
3939
- name: Install Ruby Gems for package
40-
run: bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
40+
run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
4141
- name: Run rspec tests
4242
run: bundle exec rspec spec/react_on_rails
4343
- name: Store test results

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/.bundle/
22
/.yardoc
3-
/Gemfile.lock
43
/_yardoc/
54
/coverage/
65
/doc/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: required
33
language: ruby
44

55
rvm:
6-
- 2.5.3
6+
- 2.5.9
77
- 2.6.5
88
- 2.7.0
99

Gemfile.development_dependencies

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ gem "sass-rails", "~> 6.0"
99
gem "uglifier"
1010
gem "jquery-rails"
1111
gem "puma", "~> 6.0"
12-
gem "bundler", "2.5.3"
1312

1413
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
1514
gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?

0 commit comments

Comments
 (0)