Skip to content

Commit

Permalink
Update Travis config to use Rails 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nbulaj committed Feb 6, 2021
1 parent 55488cc commit 2c217ff
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 36 deletions.
21 changes: 7 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: ruby
cache: bundler
arch:
- amd64
- ppc64le

rvm:
- 2.5
Expand All @@ -12,30 +11,24 @@ rvm:
- ruby-head

gemfile:
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile
- gemfiles/rails_6_1.gemfile
- gemfiles/rails_master.gemfile

matrix:
fast_finish: true
exclude:
- rvm: 3.0
gemfile: gemfiles/rails_5_0.gemfile
- rvm: 3.0
gemfile: gemfiles/rails_5_1.gemfile
- rvm: 3.0
gemfile: gemfiles/rails_5_2.gemfile
# Run Danger only once
include:
- rvm: 2.5
gemfile: gemfiles/rails_5_2.gemfile
# Run Danger only once
- rvm: 2.7
gemfile: gemfiles/rails_6_1.gemfile
script: bundle exec danger
- rvm: 2.7
gemfile: gemfiles/rails_6_1.gemfile
arch: ppc64le
allow_failures:
- gemfile: gemfiles/rails_master.gemfile
- rvm: ruby-head
- gemfile: gemfiles/rails_master.gemfile
arch: ppc64le
- rvm: ruby-head
arch: ppc64le
20 changes: 0 additions & 20 deletions gemfiles/rails_5_1.gemfile

This file was deleted.

4 changes: 2 additions & 2 deletions gemfiles/rails_5_0.gemfile → gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "~> 5.0.0"
gem "rails", "~> 6.1.0"
gem "rspec-core"
gem "rspec-expectations"
gem "rspec-mocks"
Expand All @@ -14,7 +14,7 @@ gem "rubocop-rails", require: false
gem "rubocop-rspec", require: false
gem "bcrypt", "~> 3.1", require: false
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]

gemspec path: "../"

0 comments on commit 2c217ff

Please sign in to comment.