1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-22 08:21:14 +00:00

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
This commit is contained in:
Toshi MARUYAMA 2015-08-30 00:37:16 +00:00
parent 70c61810e4
commit 6501dd7163

View File

@ -7,6 +7,7 @@ rvm:
- 2.0 - 2.0
- 2.1 - 2.1
- 2.2 - 2.2
- jruby-9.0.0.0
- jruby - jruby
env: env:
- "SUITE=units DB=postgresql" - "SUITE=units DB=postgresql"
@ -61,6 +62,13 @@ matrix:
- env: "SUITE=units DB=mariadb-5.5" - env: "SUITE=units DB=mariadb-5.5"
- env: "SUITE=units DB=mariadb-10.0" - env: "SUITE=units DB=mariadb-10.0"
before_install: 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 update -qq"
- "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
- dpkg -l *mysql* - dpkg -l *mysql*
@ -101,6 +109,6 @@ script:
- "bundle install" - "bundle install"
- "bundle exec rake ci:setup" - "bundle exec rake ci:setup"
- phantomjs --webdriver 4444 & - 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: notifications:
email: false email: false