diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-12 14:49:58 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-12 14:49:58 -0600 |
| commit | e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9 (patch) | |
| tree | 2ef1ecdb2f2c6641a81a47adf51fda62343be7e3 /.circleci/merge_base_branch.sh | |
| parent | Remove debugging statement (diff) | |
| parent | Make workers work on Py3 (#4027) (diff) | |
| download | synapse-e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9.tar.xz | |
Merge branch 'develop' into travis/fix-federated-group-requests
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 |