diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-03 21:08:35 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 21:08:35 +1000 |
| commit | 4fc4b881c58fd638db5f4dac0863721111b67af0 (patch) | |
| tree | cc1604f5e3b4e0a263e0e11a55b62ef4006a64a1 /.travis.yml | |
| parent | The project `matrix-synapse-auto-deploy` does not seem to be maintained anymore. (diff) | |
| parent | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration (diff) | |
| download | synapse-4fc4b881c58fd638db5f4dac0863721111b67af0.tar.xz | |
Merge branch 'develop' into develop
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index e6ba6f4752..318701c9f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,15 @@ language: python # tell travis to cache ~/.cache/pip cache: pip +before_script: + - git remote set-branches --add origin develop + - git fetch origin develop + +services: + - postgresql + matrix: + fast_finish: true include: - python: 2.7 env: TOX_ENV=packaging @@ -14,10 +22,23 @@ 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 + - python: 3.6 + env: TOX_ENV=check_isort + + - 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 |