aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-11-16 21:54:53 -0500
committerGitHub <noreply@github.com>2016-11-16 21:54:53 -0500
commit7f86429a825b46960e9f2212ab040e952ea43613 (patch)
treee9ef579cc06316faefc2cd6c7f62903983e2d9f8
parent27210f1dd2031f03ad13dbb4001838de217514f4 (diff)
parent2694a74c88bb7923dbfe4ce3e1b64a6f23dab0ef (diff)
downloadrails-7f86429a825b46960e9f2212ab040e952ea43613.tar.gz
rails-7f86429a825b46960e9f2212ab040e952ea43613.tar.bz2
rails-7f86429a825b46960e9f2212ab040e952ea43613.zip
Merge pull request #27075 from maclover7/jm-jruby-activejob
Enable JRuby testing for Active Job
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 1855e25ca8..af207f4f5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ before_script:
script: 'ci/travis.rb'
env:
+ global:
+ - "JRUBY_OPTS='--dev -J-Xmx1024M'"
matrix:
- "GEM=railties"
- "GEM=ap"
@@ -62,13 +64,11 @@ matrix:
- rvm: jruby-9.1.5.0
jdk: oraclejdk8
env:
- - "JRUBY_OPTS='--dev -J-Xmx1024M'"
- - "GEM='ap'"
+ - "GEM=ap"
- rvm: jruby-9.1.5.0
jdk: oraclejdk8
env:
- - "JRUBY_OPTS='--dev -J-Xmx1024M'"
- - "GEM='am'"
+ - "GEM=am,aj"
allow_failures:
- rvm: ruby-head
- rvm: jruby-9.1.5.0