diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-18 09:57:58 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-18 09:57:58 -0600 |
| commit | 49a044aa5f7a89594fca5556236126208ff7aa1c (patch) | |
| tree | ab8f3bdea5294ed08bad2f5ab640063fbfd479e6 /.circleci/merge_base_branch.sh | |
| parent | pep8 (diff) | |
| parent | remove redundant changelog file (diff) | |
| download | synapse-49a044aa5f7a89594fca5556236126208ff7aa1c.tar.xz | |
Merge branch 'develop' into travis/login-terms
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 |