diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-08-27 01:06:34 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-08-27 01:07:01 +0930 |
| commit | 2c84512a7217d130905f55ea0b33065a46dd4688 (patch) | |
| tree | fdd32262752d045aa13435f1af75a406d4442acf /.travis.yml | |
| parent | d2d003e8f8051e4d1a941319829603c1c713aedf (diff) | |
| parent | 107235722331f572fbe1e2a763c49acca08fc500 (diff) | |
| download | rails-2c84512a7217d130905f55ea0b33065a46dd4688.tar.gz rails-2c84512a7217d130905f55ea0b33065a46dd4688.tar.bz2 rails-2c84512a7217d130905f55ea0b33065a46dd4688.zip | |
Merge pull request #16613 from splattael/master
Speed up JRuby tests by improving the startup time
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 4c45265db0..c9755ae68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,16 @@ rvm: - rbx-2 - jruby env: - - "GEM=railties" - - "GEM=ap" - - "GEM=am,amo,as,av,aj" - - "GEM=ar:mysql" - - "GEM=ar:mysql2" - - "GEM=ar:sqlite3" - - "GEM=ar:postgresql" + global: + - JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.mode=OFF -J-Djruby.compile.invokedynamic=false -J-Xmx1024M' + matrix: + - "GEM=railties" + - "GEM=ap" + - "GEM=am,amo,as,av,aj" + - "GEM=ar:mysql" + - "GEM=ar:mysql2" + - "GEM=ar:sqlite3" + - "GEM=ar:postgresql" matrix: allow_failures: - rvm: 1.9.3 |