From 53a411986faa1e5bba8b0161b7fb2e4e1572d687 2015-03-18 13:56:04
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2015-03-18 13:56:04
Subject: [PATCH] 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

---

diff --git a/.travis.yml b/.travis.yml
index eec8aed..253825a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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"