summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2019-07-26 02:26:23 +1000
committerAmber H. Brown <hawkowl@atleastfornow.net>2019-07-26 02:26:23 +1000
commitb50d8a9dc1fb218bd43a19fa7e6b5327ca5bf5c3 (patch)
tree86becd65bcdb7cc9112c13c9be7fb774b158a28b
parentfix this (diff)
downloadsynapse-shhs-v1.2.0.2.tar.xz
fix merging forward shhs-v1.2.0.2
Diffstat (limited to '')
-rwxr-xr-x.buildkite/merge_base_branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh

index 737ef8cc75..fdccb70e3e 100755 --- a/.buildkite/merge_base_branch.sh +++ b/.buildkite/merge_base_branch.sh
@@ -2,7 +2,7 @@ set -ex -if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs-*|release-.*)$ ]]; then +if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs-.*|release-.*)$ ]]; then echo "Not merging forward, as this is a release branch" exit 0 fi