From 4e954f4bbdb1f86bb5f1c6c2d29b30f91824240d Mon Sep 17 00:00:00 2001 From: "Amber H. Brown" Date: Tue, 9 Jul 2019 20:53:38 +1000 Subject: [PATCH] make the base branch dinsic for dinsic --- .circleci/merge_base_branch.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index 4c19fa70d7..56895284ba 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh @@ -9,11 +9,12 @@ source $BASH_ENV if [[ -z "${CIRCLE_PR_NUMBER}" ]] then - echo "Can't figure out what the PR number is! Assuming merge target is develop." + echo "Can't figure out what the PR number is! Assuming merge target is dinsic." - # 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" + # It probably hasn't had a PR opened yet. Since all PRs for dinsic land on + # dinsic, we can probably assume it's based on it and will be merged into + # it. + GITBASE="dinsic" else # Get the reference, using the GitHub API GITBASE=`wget -O- https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'`