summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-08-30 00:26:25 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-08-30 00:26:25 +0000
commit5168b5e86e381c123a1a48fadb6d9567f2bfbbf0 (patch)
treed6ff9cdd18a4d29c9a28902f3899ca659c0ff696
parent3b8279354e84d792b81efc1910db78c8f3f45f83 (diff)
downloadredmine-5168b5e86e381c123a1a48fadb6d9567f2bfbbf0.tar.gz
redmine-5168b5e86e381c123a1a48fadb6d9567f2bfbbf0.zip
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
-rw-r--r--.travis.yml10
1 files changed, 9 insertions, 1 deletions
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