diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 15:37:01 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 15:37:01 +0100 |
| commit | a611c968ccf93ddf50bdf003bb496006bcf42321 (patch) | |
| tree | e79a8682325f9368a870832a587b46a84ea0cdbd | |
| parent | Replicate push actions (diff) | |
| parent | Make jenkins install lxml (diff) | |
| download | synapse-a611c968ccf93ddf50bdf003bb496006bcf42321.tar.xz | |
Merge branch 'develop' into markjh/slave_event_push_actions
| -rwxr-xr-x | jenkins-postgres.sh | 1 | ||||
| -rwxr-xr-x | jenkins-sqlite.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh index 9ac86d2593..9a78480dd8 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh @@ -26,6 +26,7 @@ tox --notest -e py27 TOX_BIN=$WORKSPACE/.tox/py27/bin $TOX_BIN/pip install psycopg2 +$TOX_BIN/pip install lxml : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh index 345d01936c..5500f8d8d6 100755 --- a/jenkins-sqlite.sh +++ b/jenkins-sqlite.sh @@ -24,6 +24,7 @@ rm .coverage* || echo "No coverage files to remove" tox --notest -e py27 TOX_BIN=$WORKSPACE/.tox/py27/bin +$TOX_BIN/pip install lxml : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} |