OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis 

Only start postgres instance for postgres tests on Travis CI
pull/3808/head
Amber Brown 2018-09-07 01:06:21 +10:00 committed by GitHub
parent 70fd75cd1d 5d848992bf
commit 1d371fc5b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -8,9 +8,6 @@ before_script:
- git remote set-branches --add origin develop - git remote set-branches --add origin develop
- git fetch origin develop - git fetch origin develop
services:
- postgresql
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
@ -25,6 +22,8 @@ matrix:
- python: 2.7 - python: 2.7
env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4" env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
services:
- postgresql
- python: 3.6 - python: 3.6
env: TOX_ENV=py36 env: TOX_ENV=py36

1
changelog.d/3806.misc Normal file
View File

@ -0,0 +1 @@
Only start postgres instance for postgres tests on Travis CI