diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
| commit | dc4b23e1a102071227288bb9d2ad77611f0d34c8 (patch) | |
| tree | c1147b1f393c416daa7fd8855850e42caf9d9956 /jenkins/prepare_synapse.sh | |
| parent | Stop generating refresh tokens (diff) | |
| parent | Merge pull request #1660 from matrix-org/rav/better_content_type_validation (diff) | |
| download | synapse-dc4b23e1a102071227288bb9d2ad77611f0d34c8.tar.xz | |
Merge branch 'develop' into rav/no_more_refresh_tokens
Diffstat (limited to 'jenkins/prepare_synapse.sh')
| -rwxr-xr-x | jenkins/prepare_synapse.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh index 6c26c5842c..ffcb1cfab9 100755 --- a/jenkins/prepare_synapse.sh +++ b/jenkins/prepare_synapse.sh @@ -15,6 +15,6 @@ tox -e py27 --notest -v TOX_BIN=$TOX_DIR/py27/bin $TOX_BIN/pip install setuptools -python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install -$TOX_BIN/pip install lxml -$TOX_BIN/pip install psycopg2 +{ python synapse/python_dependencies.py + echo lxml psycopg2 +} | xargs $TOX_BIN/pip install |