@@ -7,6 +7,7 rvm: | |||||
7 | - 2.0 |
|
7 | - 2.0 | |
8 | - 2.1 |
|
8 | - 2.1 | |
9 | - 2.2 |
|
9 | - 2.2 | |
|
10 | - jruby-9.0.0.0 | |||
10 | - jruby |
|
11 | - jruby | |
11 | env: |
|
12 | env: | |
12 | - "SUITE=units DB=postgresql" |
|
13 | - "SUITE=units DB=postgresql" | |
@@ -61,6 +62,13 matrix: | |||||
61 | - env: "SUITE=units DB=mariadb-5.5" |
|
62 | - env: "SUITE=units DB=mariadb-5.5" | |
62 | - env: "SUITE=units DB=mariadb-10.0" |
|
63 | - env: "SUITE=units DB=mariadb-10.0" | |
63 | before_install: |
|
64 | before_install: | |
|
65 | # https://github.com/travis-ci/travis-ci/issues/4720 | |||
|
66 | - if [[ ${TRAVIS_RUBY_VERSION} =~ jruby-9\.0 ]] ; | |||
|
67 | then | |||
|
68 | rvm get master ; | |||
|
69 | rvm use ${TRAVIS_RUBY_VERSION} --install ; | |||
|
70 | ruby --version ; | |||
|
71 | fi | |||
64 | - "sudo apt-get update -qq" |
|
72 | - "sudo apt-get update -qq" | |
65 | - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" |
|
73 | - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" | |
66 | - dpkg -l *mysql* |
|
74 | - dpkg -l *mysql* | |
@@ -101,6 +109,6 script: | |||||
101 | - "bundle install" |
|
109 | - "bundle install" | |
102 | - "bundle exec rake ci:setup" |
|
110 | - "bundle exec rake ci:setup" | |
103 | - phantomjs --webdriver 4444 & |
|
111 | - phantomjs --webdriver 4444 & | |
104 | - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${SUITE} |
|
112 | - JRUBY_OPTS='-J-Xmx1024m -J-XX:MaxPermSize=1024m' bundle exec rake test:${SUITE} | |
105 | notifications: |
|
113 | notifications: | |
106 | email: false |
|
114 | email: false |
General Comments 0
You need to be logged in to leave comments.
Login now