From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 30 Aug 2015 00:37:16 +0000 (+0000)
Subject: trunk: merge r14527 from 2.6-stable
X-Git-Tag: 3.2.0~262
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6501dd7163854d84d35b15d905da34d837f0ce14;p=redmine.git

trunk: merge r14527 from 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/trunk@14528 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/.travis.yml b/.travis.yml
index e90a5a011..ca31ef7cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - jruby-9.0.0.0
   - jruby
 env:
   - "SUITE=units       DB=postgresql"
@@ -61,6 +62,13 @@ matrix:
     - env: "SUITE=units       DB=mariadb-5.5"
     - env: "SUITE=units       DB=mariadb-10.0"
 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"
   - dpkg -l *mysql*
@@ -101,6 +109,6 @@ script:
   - "bundle install"
   - "bundle exec rake ci:setup"
   - phantomjs --webdriver 4444 &
-  - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${SUITE}
+  - JRUBY_OPTS='-J-Xmx1024m -J-XX:MaxPermSize=1024m' bundle exec rake test:${SUITE}
 notifications:
   email: false