diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-26 02:07:05 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-26 02:07:05 +1000 |
| commit | 3edf6e987ebb4ec0bc81a7566758281019b4743e (patch) | |
| tree | 133ef734b2c77a20b6628a541a5954d67dd9bad6 | |
| parent | Merge tag 'v1.2.0' into shhs (diff) | |
| download | synapse-3edf6e987ebb4ec0bc81a7566758281019b4743e.tar.xz | |
fix this shhs-v1.2.0.1
| -rwxr-xr-x | .buildkite/merge_base_branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh index 26176d6465..737ef8cc75 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 |