summary refs log tree commit diff
path: root/.buildkite
diff options
context:
space:
mode:
Diffstat (limited to '.buildkite')
-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 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