diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-12-04 14:07:28 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-12-04 14:07:28 +0000 |
commit | 002db39a36ecbe1b09775cb26cf756e436ab1d08 (patch) | |
tree | c46c70228af8f87dc5bfcb989383adb062e905ba /.travis.yml | |
parent | Revert "Merge branch 'rav/timestamp_patch' into matrix-org-hotfixes" (diff) | |
parent | fix upgrade.rst link again (diff) | |
download | synapse-002db39a36ecbe1b09775cb26cf756e436ab1d08.tar.xz |
Merge tag 'v0.34.0rc1' into matrix-org-hotfixes
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 655fab9d8e..84d5efff9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,24 +36,24 @@ matrix: env: TOX_ENV="pep8,check_isort" - python: 2.7 - env: TOX_ENV=py27 TRIAL_FLAGS="-j 2" + env: TOX_ENV=py27,codecov TRIAL_FLAGS="-j 2" - python: 2.7 env: TOX_ENV=py27-old TRIAL_FLAGS="-j 2" - python: 2.7 - env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4" + env: TOX_ENV=py27-postgres,codecov TRIAL_FLAGS="-j 4" services: - postgresql - python: 3.5 - env: TOX_ENV=py35 TRIAL_FLAGS="-j 2" + env: TOX_ENV=py35,codecov TRIAL_FLAGS="-j 2" - python: 3.6 - env: TOX_ENV=py36 TRIAL_FLAGS="-j 2" + env: TOX_ENV=py36,codecov TRIAL_FLAGS="-j 2" - python: 3.6 - env: TOX_ENV=py36-postgres TRIAL_FLAGS="-j 4" + env: TOX_ENV=py36-postgres,codecov TRIAL_FLAGS="-j 4" services: - postgresql |