[PATCH] D123365: workflow: When updating the issueXX branch, use force push

[Tobias Hieta via Phabricator via llvm-commits]

thieta created this revision.
thieta added a reviewer: tstellar.
Herald added a project: All.
thieta requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Otherwise if you try to update the branch with a new /cherry-pick
from the same issue you will run into problems similar as to the
one shown in this workflow:
https://github.com/llvm/llvm-project/runs/5864672298?check_suite_focus=true


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D123365

Files:
  llvm/utils/git/github-automation.py


Index: llvm/utils/git/github-automation.py
===================================================================
--- llvm/utils/git/github-automation.py
+++ llvm/utils/git/github-automation.py
@@ -185,7 +185,7 @@
 
         push_url = self.push_url
         print('Pushing to {} {}'.format(push_url, branch_name))
-        local_repo.git.push(push_url, 'HEAD:{}'.format(branch_name))
+        local_repo.git.push(push_url, 'HEAD:{}'.format(branch_name), force=True)
 
         self.issue_notify_branch()
         self.issue_remove_cherry_pick_failed_label()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D123365.421436.patch
Type: text/x-patch
Size: 556 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220408/44f9ca6b/attachment.bin>