diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
| commit | 1cfda3d2d8f0f63099c0176b4e01907aba7ad804 (patch) | |
| tree | 7691812e7aa296267978d375d006ff8a1bf66aa1 /jenkins.sh | |
| parent | Simplify code (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-1cfda3d2d8f0f63099c0176b4e01907aba7ad804.tar.xz | |
Merge branch 'develop' into daniel/forgetrooms
Diffstat (limited to '')
| -rwxr-xr-x | jenkins.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jenkins.sh b/jenkins.sh index 4804022e80..8d2ac63c56 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -17,14 +17,20 @@ export PEP8SUFFIX="--output-file=violations.flake8.log || echo flake8 finished w tox -: ${GIT_BRANCH:="$(git rev-parse --abbrev-ref HEAD)"} +: ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} set +u . .tox/py27/bin/activate set -u +if [[ ! -e .sytest-base ]]; then + git clone https://github.com/matrix-org/sytest.git .sytest-base --mirror +else + (cd .sytest-base; git fetch) +fi + rm -rf sytest -git clone https://github.com/matrix-org/sytest.git sytest +git clone .sytest-base sytest --shared cd sytest git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop) |