diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-19 09:52:03 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-19 09:54:31 +0000 |
| commit | 0869f01e74b356e2f5f617a61aa6e0b6b2c08f79 (patch) | |
| tree | ab21294c0be999c8988ee213b7062ddc6548e810 | |
| parent | Merge pull request #4632 from matrix-org/erikj/basic_sentry (diff) | |
| download | synapse-0869f01e74b356e2f5f617a61aa6e0b6b2c08f79.tar.xz | |
Test against Postgres 9.5 as well as 9.4
Postgres 9.5 is the first to support UPSERTs, so we should really run against it as well as 9.4.
| -rw-r--r-- | .travis.yml | 46 | ||||
| -rw-r--r-- | changelog.d/4676.misc | 1 |
2 files changed, 33 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 3cab77ce4d..f6c91c2621 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,6 @@ cache: # - $HOME/.cache/pip/wheels -addons: - postgresql: "9.4" - # don't clone the whole repo history, one commit will do git: depth: 1 @@ -25,6 +22,7 @@ branches: - master - develop - /^release-v/ + - rav/pg95 # When running the tox environments that call Twisted Trial, we can pass the -j # flag to run the tests concurrently. We set this to 2 for CPU bound tests @@ -32,36 +30,53 @@ branches: matrix: fast_finish: true include: - - python: 2.7 - env: TOX_ENV=packaging - - - python: 3.6 - env: TOX_ENV="pep8,check_isort" + - name: "pep8" + python: 3.6 + env: TOX_ENV="pep8,check_isort,packaging" - - python: 2.7 + - name: "py2.7 / sqlite" + python: 2.7 env: TOX_ENV=py27,codecov TRIAL_FLAGS="-j 2" - - python: 2.7 + - name: "py2.7 / sqlite / olddeps" + python: 2.7 env: TOX_ENV=py27-old TRIAL_FLAGS="-j 2" - - python: 2.7 + - name: "py2.7 / postgres9.5" + python: 2.7 + addons: + postgresql: "9.5" env: TOX_ENV=py27-postgres,codecov TRIAL_FLAGS="-j 4" services: - postgresql - - python: 3.5 + - name: "py3.5 / sqlite" + python: 3.5 env: TOX_ENV=py35,codecov TRIAL_FLAGS="-j 2" - - python: 3.6 + - name: "py3.6 / sqlite" + python: 3.6 env: TOX_ENV=py36,codecov TRIAL_FLAGS="-j 2" - - python: 3.6 + - name: "py3.6 / postgres9.4" + python: 3.6 + addons: + postgresql: "9.4" + env: TOX_ENV=py36-postgres TRIAL_FLAGS="-j 4" + services: + - postgresql + + - name: "py3.6 / postgres9.5" + python: 3.6 + addons: + postgresql: "9.5" env: TOX_ENV=py36-postgres,codecov TRIAL_FLAGS="-j 4" services: - postgresql - # we only need to check for the newsfragment if it's a PR build if: type = pull_request + name: "check-newsfragment" python: 3.6 env: TOX_ENV=check-newsfragment script: @@ -70,6 +85,9 @@ matrix: - tox -e $TOX_ENV install: + # this just logs the postgres version we will be testing against (if any) + - psql -At -U postgres -c 'select version();' + - pip install tox # if we don't have python3.6 in this environment, travis unhelpfully gives us diff --git a/changelog.d/4676.misc b/changelog.d/4676.misc new file mode 100644 index 0000000000..a250558e69 --- /dev/null +++ b/changelog.d/4676.misc @@ -0,0 +1 @@ +Test against Postgres 9.5 as well as 9.4 |