From 9140c11fcb2e418fe833aaf02a2e5fb10dcf9f30 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Wed, 16 Nov 2016 19:50:37 -0500 Subject: Enable JRuby testing for Active Job All tests pass for me locally. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1855e25ca8..074a2faf12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,12 +63,12 @@ matrix: 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 -- cgit v1.2.3 From 2694a74c88bb7923dbfe4ce3e1b64a6f23dab0ef Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Wed, 16 Nov 2016 20:27:34 -0500 Subject: Make JRUBY_OPTS a global Travis environment variable --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 074a2faf12..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,12 +64,10 @@ matrix: - rvm: jruby-9.1.5.0 jdk: oraclejdk8 env: - - "JRUBY_OPTS='--dev -J-Xmx1024M'" - "GEM=ap" - rvm: jruby-9.1.5.0 jdk: oraclejdk8 env: - - "JRUBY_OPTS='--dev -J-Xmx1024M'" - "GEM=am,aj" allow_failures: - rvm: ruby-head -- cgit v1.2.3