diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-07 01:06:21 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 01:06:21 +1000 |
| commit | 1d371fc5b36096897a91d4770d91f638babf991e (patch) | |
| tree | d51674b2525b03444e922abb6276863a2925fd92 | |
| parent | Merge pull request #3788 from matrix-org/erikj/remove_conn_id (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-1d371fc5b36096897a91d4770d91f638babf991e.tar.xz | |
Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis
Only start postgres instance for postgres tests on Travis CI
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | changelog.d/3806.misc | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 11c76db2e5..ebc972ed24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ before_script: - git remote set-branches --add origin develop - git fetch origin develop -services: - - postgresql - matrix: fast_finish: true include: @@ -25,6 +22,8 @@ matrix: - python: 2.7 env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4" + services: + - postgresql - python: 3.6 env: TOX_ENV=py36 diff --git a/changelog.d/3806.misc b/changelog.d/3806.misc new file mode 100644 index 0000000000..3c722eef2d --- /dev/null +++ b/changelog.d/3806.misc @@ -0,0 +1 @@ +Only start postgres instance for postgres tests on Travis CI |