OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

make the base branch dinsic for dinsic

pull/5646/head dinsic_2019-06-27_1
Amber H. Brown 2019-07-09 20:53:38 +10:00
parent f10b6f7385
commit 4e954f4bbd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.circleci/merge_base_branch.sh
View File

@ -9,11 +9,12 @@ source $BASH_ENV
if [[ -z "${CIRCLE_PR_NUMBER}" ]] if [[ -z "${CIRCLE_PR_NUMBER}" ]]
then 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 # It probably hasn't had a PR opened yet. Since all PRs for dinsic land on
# can probably assume it's based on it and will be merged into it. # dinsic, we can probably assume it's based on it and will be merged into
GITBASE="develop" # it.
GITBASE="dinsic"
else else
# Get the reference, using the GitHub API # 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'` GITBASE=`wget -O- https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'`