diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-04 07:13:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 07:13:38 +0100 |
| commit | a4ab49137192e7994b231c6a8204baa452c9a8d6 (patch) | |
| tree | 680f11091640bf6dedeb75922f2a90bafcc27d9f /.travis.yml | |
| parent | Remove event re-signing hacks (diff) | |
| parent | Reject invalid server names (#3480) (diff) | |
| download | synapse-a4ab49137192e7994b231c6a8204baa452c9a8d6.tar.xz | |
Merge branch 'develop' into rav/drop_re_signing_hacks
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index e6ba6f4752..a98d547978 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,12 @@ language: python # tell travis to cache ~/.cache/pip cache: pip +before_script: + - git remote set-branches --add origin develop + - git fetch origin develop + matrix: + fast_finish: true include: - python: 2.7 env: TOX_ENV=packaging @@ -14,10 +19,13 @@ matrix: - python: 2.7 env: TOX_ENV=py27 - + - python: 3.6 env: TOX_ENV=py36 + - python: 3.6 + env: TOX_ENV=check-newsfragment + install: - pip install tox |