summary refs log tree commit diff
path: root/.travis.yml
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-11 14:17:33 +0100
committerErik Johnston <erik@matrix.org>2018-09-11 14:17:33 +0100
commit17201abd5323b2cda4c2d281fe9f3ba25ca20274 (patch)
tree2fb4084f3e1068dc6e6cc2f27b83c22d519dd918 /.travis.yml
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3834 from mvgorcum/develop (diff)
downloadsynapse-17201abd5323b2cda4c2d281fe9f3ba25ca20274.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 318701c9f8..ebc972ed24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,6 @@ before_script:
   - git remote set-branches --add origin develop
   - git fetch origin develop
 
-services:
-  - postgresql
-
 matrix:
   fast_finish: true
   include:
@@ -25,6 +22,8 @@ matrix:
 
   - python: 2.7
     env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
+    services:
+      - postgresql
 
   - python: 3.6
     env: TOX_ENV=py36
@@ -35,10 +34,6 @@ matrix:
   - python: 3.6
     env: TOX_ENV=check-newsfragment
 
-  allow_failures:
-  - python: 2.7
-    env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
-
 install:
   - pip install tox