From: Ward Vandewege Date: Wed, 19 Aug 2020 23:30:28 +0000 (-0400) Subject: Make sure we don't accidentally delete our release branches. X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/ac0a28165e30c658931126aa92262aee32c52691?hp=4c0df68911f259222951180296698bf4e8e5840f Make sure we don't accidentally delete our release branches. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- 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