Merged r14076 from trunk to 2.6-stable

.travis.yml: move "matrix" after "env"

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14130 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-03-18 13:56:04 +00:00
parent 1b3c68da29
commit 53a411986f

View File

@@ -9,12 +9,6 @@ rvm:
- 2.0
- 2.1
- jruby
matrix:
allow_failures:
# SCM tests fail randomly due to IO.popen().
# http://www.redmine.org/issues/19091
# https://github.com/jruby/jruby/issues/779
- rvm: jruby
env:
- "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
- "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
@@ -25,6 +19,12 @@ env:
- "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
- "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
- "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
matrix:
allow_failures:
# SCM tests fail randomly due to IO.popen().
# http://www.redmine.org/issues/19091
# https://github.com/jruby/jruby/issues/779
- rvm: jruby
before_install:
- "sudo apt-get update -qq"
- "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"