Skip to content

Commit

Permalink
Update Travis Gemfiles and add exclusions
Browse files Browse the repository at this point in the history
  • Loading branch information
spohlenz committed May 11, 2016
1 parent 9788885 commit 5fd3904
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
tmp
*.gem
Gemfile.lock
gemfiles/*.lock
sandbox/log
sandbox/tmp
sandbox/public/assets
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ before_install:

rvm:
- 2.0.0
- 2.1.0
- 2.1.10
- 2.2.5
- 2.3.1

gemfile:
Expand All @@ -14,4 +15,10 @@ gemfile:
- gemfiles/rails-4.1.gemfile
- gemfiles/rails-4.2.gemfile
- gemfiles/rails-5.0.gemfile


matrix:
exclude:
- rvm: 2.0.0
gemfile: gemfiles/rails-5.0.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails-5.0.gemfile
2 changes: 1 addition & 1 deletion gemfiles/rails-3.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '3.2.22'
gem 'rails', '3.2.22.2'
gem 'jquery-rails'
gem 'rake', '< 11'

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails-4.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.1.14'
gem 'rails', '4.1.15'
gem 'jquery-rails'
gem 'rake', '< 11'

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails-4.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.2.5'
gem 'rails', '4.2.6'
gem 'jquery-rails'
gem 'rake', '< 11'

Expand Down

0 comments on commit 5fd3904

Please sign in to comment.