summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-16 16:47:26 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-16 16:47:26 +0100
commit10405153c226b9aa2eccb0c4cf16de03cabde778 (patch)
tree7ca7a30ab5b3723cb11fb70caab6fa76f3a88694
parentchangelog (diff)
downloadsynapse-10405153c226b9aa2eccb0c4cf16de03cabde778.tar.xz
Use wget rather than curl
the docker image doesn't have wget
-rwxr-xr-x.circleci/merge_base_branch.sh4
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