diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-01 17:16:20 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-01 17:16:20 +0100 |
| commit | 5908a8f6f5abd4fb08cf0c43e7ee51175d9bf7ac (patch) | |
| tree | 212df92ddefaf749db59c2e431d768184540de19 /.circleci/merge_base_branch.sh | |
| parent | changelog (diff) | |
| parent | Update instructions to point to pip install (#3985) (diff) | |
| download | synapse-5908a8f6f5abd4fb08cf0c43e7ee51175d9bf7ac.tar.xz | |
Merge branch 'develop' into rav/fix_missing_create_event_error
Diffstat (limited to '.circleci/merge_base_branch.sh')
| -rwxr-xr-x | .circleci/merge_base_branch.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index 9614eb91b6..6b0bf3aa48 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh @@ -9,13 +9,16 @@ source $BASH_ENV if [[ -z "${CIRCLE_PR_NUMBER}" ]] then - echo "Can't figure out what the PR number is!" - exit 1 + echo "Can't figure out what the PR number is! Assuming merge target is develop." + + # It probably hasn't had a PR opened yet. Since all PRs land on develop, we + # can probably assume it's based on it and will be merged into it. + 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'` fi -# 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'` - # Show what we are before git show -s |