Skip to content

Commit 7572fca

Browse files
authored
Tolerate branches already removed during release/start (#2076)
Signed-off-by: Andreas Maier <maiera@de.ibm.com>
1 parent 8c7ccd5 commit 7572fca

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,8 @@ release_publish:
563563
git pull
564564
git tag -f $(VERSION)
565565
git push -f --tags
566-
git branch -D release_$(VERSION)
567-
git branch -D -r origin/release_$(VERSION)
566+
-git branch -D release_$(VERSION)
567+
-git branch -D -r origin/release_$(VERSION)
568568
rm -f branch.tmp
569569
@echo "Done: Triggered the publish workflow - now wait for it to finish and verify the publishing."
570570
@echo "Makefile: $@ done."
@@ -608,8 +608,8 @@ start_tag:
608608
git pull
609609
git tag -f $(VERSION)a0
610610
git push -f --tags
611-
git branch -D start_$(VERSION)
612-
git branch -D -r origin/start_$(VERSION)
611+
-git branch -D start_$(VERSION)
612+
-git branch -D -r origin/start_$(VERSION)
613613
rm -f branch.tmp
614614
@echo "Done: Pushed the release start tag and cleaned up the release start branch."
615615
@echo "Makefile: $@ done."

0 commit comments

Comments
 (0)