Skip to content

Commit

Permalink
Merge pull request #1601 from projectblacklight/fix_matrix
Browse files Browse the repository at this point in the history
Use a valid version of rails for jruby. Remove duplicate matrix entry
  • Loading branch information
cbeer committed Jan 4, 2017
2 parents 15af517 + 8f1d517 commit 57c12b9
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ matrix:
include:
- rvm: 2.3.3
env: "RAILS_VERSION=4.2.7.1"
- rvm: 2.4.0
env: "RAILS_VERSION=5.0.1"
- rvm: jruby-9.1.6.0
env: "RAILS_VERSION=5.0.11 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
env: "RAILS_VERSION=5.0.1 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
allow_failures:
- rvm: jruby-9.1.6.0
fast_finish: true
Expand Down

0 comments on commit 57c12b9

Please sign in to comment.