diff options
| author | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
| commit | acded821c4ff9da11ce7f916ca8b0f369bcb4e87 (patch) | |
| tree | 6a797cfae11a8cf64277ff878c090d7905db9d19 /jenkins-postgres.sh | |
| parent | Remove vector specific style (diff) | |
| parent | Fix more typos in per-request metrics (diff) | |
| download | synapse-acded821c4ff9da11ce7f916ca8b0f369bcb4e87.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'jenkins-postgres.sh')
| -rwxr-xr-x | jenkins-postgres.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh index 9ac86d2593..ae6b111591 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh @@ -25,7 +25,9 @@ rm .coverage* || echo "No coverage files to remove" tox --notest -e py27 TOX_BIN=$WORKSPACE/.tox/py27/bin +python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install $TOX_BIN/pip install psycopg2 +$TOX_BIN/pip install lxml : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} |