diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 16:21:49 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 16:21:49 +0100 |
commit | 712030aeef97c414d641a65b398355ed74dc7baf (patch) | |
tree | a355a2b8c9e66264a991dff3d41d3e19cdd90d5e /jenkins-sqlite.sh | |
parent | Add an HTTP API for removing rejected pushers. (diff) | |
parent | pip install new python dependencies in jenkins.sh (diff) | |
download | synapse-712030aeef97c414d641a65b398355ed74dc7baf.tar.xz |
Merge branch 'develop' into markjh/split_pusher
Diffstat (limited to 'jenkins-sqlite.sh')
-rwxr-xr-x | jenkins-sqlite.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh index 345d01936c..9398d9db15 100755 --- a/jenkins-sqlite.sh +++ b/jenkins-sqlite.sh @@ -24,6 +24,8 @@ 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 lxml : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} |