projects / arvados-dev.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c0df68)
Make sure we don't accidentally delete our release branches.
authorWard Vandewege <ward@curii.com>
Wed, 19 Aug 2020 23:30:28 +0000 (19:30 -0400)
committerWard Vandewege <ward@curii.com>
Wed, 19 Aug 2020 23:30:28 +0000 (19:30 -0400)
No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

jenkins/run-delete-merged-branches.sh patch | blob | history

diff --git a/jenkins/run-delete-merged-branches.sh b/jenkins/run-delete-merged-branches.sh
index 627cb4097482c700331b638f57f2ac3c384cd18d..361d9bb4a20fe50e6af171b9c521573eb0b54c22 100755 (executable)
--- a/jenkins/run-delete-merged-branches.sh
+++ b/jenkins/run-delete-merged-branches.sh
@@ -20,7 +20,7 @@ trap '_exit_handler $LINENO' EXIT ERR
 # List here branches that you don't want to ever delete, separated with "|"
 # (as they will be passed as a parameter to egrep)
 # IE: "keep_this_branch|also_this_other|and_this_one"
-branches_to_keep="master|integration|dev|staging"
+branches_to_keep="master|main|integration|dev|staging|.*\-dev"
 
 git remote update --prune
 git checkout master