Merge branch '19092-upload-crunchstat_summary-to-pypi'

[arvados-dev.git] / jenkins / run-delete-merged-branches.sh

diff --git a/jenkins/run-delete-merged-branches.sh b/jenkins/run-delete-merged-branches.sh
index 175b14421a3b1bcfc917de45956a78d20e84bd5d..fdab8e6ace47e3d202e4a52fba6b3c10b76d1129 100755 (executable)
--- a/jenkins/run-delete-merged-branches.sh
+++ b/jenkins/run-delete-merged-branches.sh
@@ -20,13 +20,14 @@ 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"
+branches_to_keep="master|main|integration|dev|staging|.*\-dev"
 
 git remote update --prune
-git checkout master
+git checkout main
+git pull
 
 git branch --remote --merged | \
-    egrep -v ${branches_to_keep} | \
+    egrep -v "/(${branches_to_keep})\$" | \
     sed 's/origin\///' | \
-    xargs -n 1 git push --delete origin
+    xargs --no-run-if-empty -n 1 git push --delete origin