Skip to content

Commit

Permalink
Use Ruby 2.7 for development and CI
Browse files Browse the repository at this point in the history
  • Loading branch information
guialbuk committed Jun 22, 2020
1 parent 693c297 commit 6757e32
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
2.7.1
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.6.5
ruby 2.7.1
27 changes: 19 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ env:
- DATABASE_ADAPTER=sqlite3
- DATABASE_ADAPTER=postgresql
rvm:
- 2.6.5
- 2.5.7
- 2.4.9
- 2.7.1
- 2.6.6
- 2.5.8
- 2.4.10
gemfile:
- gemfiles/rails_6_0.gemfile
- gemfiles/rails_5_2.gemfile
Expand All @@ -18,16 +19,26 @@ gemfile:
- gemfiles/rails_4_2.gemfile
matrix:
exclude:
- rvm: 2.6.5
- rvm: 2.7.1
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.4.9
- rvm: 2.6.6
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.4.10
gemfile: gemfiles/rails_6_0.gemfile
cache: bundler
# Source: <https://docs.travis-ci.com/user/languages/ruby/#bundler-20>
before_install:
- nvm install 12
- gem update --system '2.7.8' --no-document
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2' --no-document
# Use Bundler 1.x for Ruby 2.4/2.5 and Rails 4.2
- |
if ruby --version | grep -E "2.(4|5)."
then
gem update --system '2.7.8' --no-document
gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
gem install bundler -v '< 2' --no-document
else
gem update --system --no-document
gem update bundler --no-document
fi
install: "bundle install --jobs=3 --retry=3"
script: "bundle exec rake"
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'appraisal', '2.2.0'
gem 'bundler', '~> 1.1'
gem 'bundler'
gem 'pry'
gem 'pry-byebug'
gem 'rake', '13.0.1'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ PLATFORMS

DEPENDENCIES
appraisal (= 2.2.0)
bundler (~> 1.1)
bundler
fssm
pry
pry-byebug
Expand All @@ -77,4 +77,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.17.3
2.1.4
2 changes: 1 addition & 1 deletion gemfiles/rails_4_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "appraisal", "2.2.0"
gem "bundler", "~> 1.1"
gem "bundler"
gem "pry"
gem "pry-byebug"
gem "rake", "13.0.1"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "appraisal", "2.2.0"
gem "bundler", "~> 1.1"
gem "bundler"
gem "pry"
gem "pry-byebug"
gem "rake", "13.0.1"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_5_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ PLATFORMS
DEPENDENCIES
appraisal (= 2.2.0)
bcrypt (~> 3.1.7)
bundler (~> 1.1)
bundler
fssm
jbuilder (~> 2.5)
jquery-rails
Expand Down Expand Up @@ -239,4 +239,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.17.3
2.1.4
2 changes: 1 addition & 1 deletion gemfiles/rails_5_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "appraisal", "2.2.0"
gem "bundler", "~> 1.1"
gem "bundler"
gem "pry"
gem "pry-byebug"
gem "rake", "13.0.1"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_5_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ PLATFORMS
DEPENDENCIES
appraisal (= 2.2.0)
bcrypt (~> 3.1.7)
bundler (~> 1.1)
bundler
capybara (~> 2.13)
fssm
jbuilder (~> 2.5)
Expand Down Expand Up @@ -255,4 +255,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.17.3
2.1.4
2 changes: 1 addition & 1 deletion gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "appraisal", "2.2.0"
gem "bundler", "~> 1.1"
gem "bundler"
gem "pry"
gem "pry-byebug"
gem "rake", "13.0.1"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_5_2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ DEPENDENCIES
appraisal (= 2.2.0)
bcrypt (~> 3.1.7)
bootsnap (>= 1.1.0)
bundler (~> 1.1)
bundler
capybara (~> 3.1.1)
chromedriver-helper
fssm
Expand Down Expand Up @@ -274,4 +274,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.17.3
2.1.4
2 changes: 1 addition & 1 deletion gemfiles/rails_6_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "appraisal", "2.2.0"
gem "bundler", "~> 1.1"
gem "bundler"
gem "pry"
gem "pry-byebug"
gem "rake", "13.0.1"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_6_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ DEPENDENCIES
appraisal (= 2.2.0)
bcrypt (~> 3.1.7)
bootsnap (>= 1.4.2)
bundler (~> 1.1)
bundler
capybara (>= 2.15)
fssm
jbuilder (~> 2.7)
Expand Down Expand Up @@ -298,4 +298,4 @@ DEPENDENCIES
zeus

BUNDLED WITH
1.17.3
2.1.4

0 comments on commit 6757e32

Please sign in to comment.