From 5168b5e86e381c123a1a48fadb6d9567f2bfbbf0 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 30 Aug 2015 00:26:25 +0000
Subject: [PATCH] 2.6-stable: travis: add jruby 9000

refer:
https://github.com/travis-ci/travis-ci/issues/4720

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14527 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8d5ad4342..b3935b36c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - jruby-9.0.0.0
   - jruby
 env:
   - "SUITE=units       DB=postgresql"
@@ -27,6 +28,13 @@ matrix:
     # https://github.com/jruby/jruby/issues/779
     - rvm: jruby
 before_install:
+  # https://github.com/travis-ci/travis-ci/issues/4720
+  - if [[ ${TRAVIS_RUBY_VERSION} =~ jruby-9\.0 ]] ;
+    then
+      rvm get master ;
+      rvm use ${TRAVIS_RUBY_VERSION} --install ;
+      ruby --version ;
+    fi
   - "sudo apt-get update -qq"
   - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
 script:
@@ -38,6 +46,6 @@ script:
   - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
   - "bundle install"
   - export TEST_SUITE=${SUITE}
-  - "JRUBY_OPTS=-J-Xmx1024m bundle exec rake ci"
+  - JRUBY_OPTS='-J-Xmx1024m -J-XX:MaxPermSize=1024m' bundle exec rake ci
 notifications:
   email: false