Skip to content

Commit 769ad10

Browse files
committed
simplify + hook-up travis-ci to run with 4.0 gemfile as well
1 parent f487547 commit 769ad10

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

.travis.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ gemfile:
1515
- gemfiles/rails30.gemfile
1616
- gemfiles/rails31.gemfile
1717
- gemfiles/rails32.gemfile
18+
- gemfiles/rails40.gemfile
1819
env:
19-
- JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
20-
- JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
20+
- JRUBY_OPTS="--1.8 $JRUBY_OPTS"
21+
- JRUBY_OPTS="--1.9 $JRUBY_OPTS"
22+
matrix:
23+
allow_failures:
24+
#- rvm: jruby-head
25+
exclude:
26+
# Rails 4 prefers Ruby 2.0 (or at least >= 1.9.3) :
27+
- rvm: jruby
28+
gemfile: gemfiles/rails40.gemfile
29+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
30+
- rvm: jruby-head
31+
gemfile: gemfiles/rails40.gemfile
32+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"

0 commit comments

Comments
 (0)