Merge pull request #1577 from bf4/fix_ci_jruby

Fix how we set JRuby env vars
This commit is contained in:
L. Preston Sego III 2016-03-11 10:42:58 -05:00
commit 1d22c2f532

View File

@ -14,9 +14,6 @@ rvm:
jdk:
- oraclejdk8
before_install:
- '[ "$JRUBY_OPTS" != "" ] && export JRUBY_OPTS="--dev -Xcli.debug=true --debug"'
install: bundle install --path=vendor/bundle --retry=3 --jobs=3
cache:
directories:
@ -26,10 +23,13 @@ script:
- bundle exec rake ci
env:
- "RAILS_VERSION=4.0"
- "RAILS_VERSION=4.1"
- "RAILS_VERSION=4.2"
- "RAILS_VERSION=master"
global:
- "JRUBY_OPTS='--dev -J-Xmx1024M'"
matrix:
- "RAILS_VERSION=4.0"
- "RAILS_VERSION=4.1"
- "RAILS_VERSION=4.2"
- "RAILS_VERSION=master"
matrix:
exclude: