From 7c2197645d6be2a37e608f7b22f8bb8c9d2f8782 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <github@benjaminfleischer.com>
Date: Wed, 9 Mar 2016 22:20:56 -0600
Subject: [PATCH] Fix how we set JRuby env vars

Always set JRUBY_OPTs, just like TravisCI
---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1f53d59..48224ab5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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: