[ARVADOS-DEV] updated: ac0a28165e30c658931126aa92262aee32c52691

[Git user]

Summary of changes:
 jenkins/run-delete-merged-branches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  ac0a28165e30c658931126aa92262aee32c52691 (commit)
      from  4c0df68911f259222951180296698bf4e8e5840f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ac0a28165e30c658931126aa92262aee32c52691
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Aug 19 19:30:28 2020 -0400

    Make sure we don't accidentally delete our release branches.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/jenkins/run-delete-merged-branches.sh b/jenkins/run-delete-merged-branches.sh
index 627cb40..361d9bb 100755
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--