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

fix merging forward

shhs shhs-v1.2.0.2
Amber H. Brown 2019-07-26 02:26:23 +10:00
parent 3edf6e987e
commit b50d8a9dc1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.buildkite/merge_base_branch.sh
View File

@ -2,7 +2,7 @@
set -ex 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" echo "Not merging forward, as this is a release branch"
exit 0 exit 0
fi fi