Preseed the run-tests.sh cache to make test runs faster.

[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 627cb4097482c700331b638f57f2ac3c384cd18d..c2ecacb92201e809d5b221de59d189b73ee4bd1e 100755 (executable)
--- a/jenkins/run-delete-merged-branches.sh
+++ b/jenkins/run-delete-merged-branches.sh
@@ -20,10 +20,11 @@ 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
+git pull
 
 git branch --remote --merged | \
     egrep -v "/(${branches_to_keep})\$" | \