diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-17 20:10:44 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 20:10:44 +1100 |
| commit | 80736fd8eda37535d95712769eaf1eb3b13b4ccf (patch) | |
| tree | 7ca7a30ab5b3723cb11fb70caab6fa76f3a88694 /.circleci/merge_base_branch.sh | |
| parent | Various cleanups in the federation client code (#4031) (diff) | |
| parent | Use wget rather than curl (diff) | |
| download | synapse-80736fd8eda37535d95712769eaf1eb3b13b4ccf.tar.xz | |
Merge pull request #4041 from matrix-org/rav/run_tests_in_docker
run the circle builds in docker containers
Diffstat (limited to '.circleci/merge_base_branch.sh')
| -rwxr-xr-x | .circleci/merge_base_branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index 6b0bf3aa48..b2c8c40f4c 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh @@ -16,7 +16,7 @@ then GITBASE="develop" else # Get the reference, using the GitHub API - GITBASE=`curl -q https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'` + GITBASE=`wget -O- https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'` fi # Show what we are before @@ -31,4 +31,4 @@ git fetch -u origin $GITBASE git merge --no-edit origin/$GITBASE # Show what we are after. -git show -s \ No newline at end of file +git show -s |