diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
| commit | 54def42c19c51b102dbd9a77dfd2430944a94d79 (patch) | |
| tree | da30431884421f42ab95e103bf66c7343d4cc4c4 /.travis.yml | |
| parent | Fix terms UI auth test (diff) | |
| parent | fix branch regexp (diff) | |
| download | synapse-54def42c19c51b102dbd9a77dfd2430944a94d79.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to '')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2077f6af72..197dec2bc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,13 @@ language: python # tell travis to cache ~/.cache/pip cache: pip +# only build branches we care about (PRs are built seperately) +branches: + only: + - master + - develop + - /^release-v/ + before_script: - git remote set-branches --add origin develop - git fetch origin develop @@ -14,7 +21,7 @@ matrix: - python: 2.7 env: TOX_ENV=packaging - - python: 2.7 + - python: 3.6 env: TOX_ENV=pep8 - python: 2.7 |