Merged r14076 from trunk to 3.0-stable

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

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14131 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.travis.yml b/.travis.yml
index 7b6b93c84a20f3fdd26d7ecf01bb229ca7a19acb..013171bd0523333b738a2bc463780a720a85d5ce 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,6 @@ rvm:
   - 2.1
   - 2.2
   - 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"
@@ -27,6 +21,12 @@ env:
   - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
   - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
   - "TEST_SUITE=ui          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"