diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
| commit | 782689bd408b7d291fef913a318e1a6dda6f13e1 (patch) | |
| tree | 50502568cd0b9966e8c42d48d8db5d6cdf73fe1c /.travis.yml | |
| parent | Split ProfileHandler into master and worker (diff) | |
| parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
| download | synapse-782689bd408b7d291fef913a318e1a6dda6f13e1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index b34b17af75..318701c9f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ before_script: - git remote set-branches --add origin develop - git fetch origin develop +services: + - postgresql + matrix: fast_finish: true include: @@ -20,6 +23,9 @@ matrix: - python: 2.7 env: TOX_ENV=py27 + - python: 2.7 + env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4" + - python: 3.6 env: TOX_ENV=py36 @@ -29,6 +35,10 @@ 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 |