diff options
author | Tobias Hieta <tobias@hieta.se> | 2022-04-08 09:28:22 +0200 |
---|---|---|
committer | Tobias Hieta <tobias@hieta.se> | 2022-04-12 08:03:59 +0200 |
commit | 1889170aeb61da6509d75069726bc1a4aa7c9113 (patch) | |
tree | 67e2ca0190007ad5a6f56860214d35caa9813864 /llvm | |
parent | e758b77161a70d7e7260d8f52bf161a89d73af8a (diff) | |
download | llvm-1889170aeb61da6509d75069726bc1a4aa7c9113.zip llvm-1889170aeb61da6509d75069726bc1a4aa7c9113.tar.gz llvm-1889170aeb61da6509d75069726bc1a4aa7c9113.tar.bz2 |
workflow: When updating the issueXX branch, use force push
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
Reviewed By: tstellar
Differential Revision: https://reviews.llvm.org/D123365
Diffstat (limited to 'llvm')
-rwxr-xr-x | llvm/utils/git/github-automation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/git/github-automation.py b/llvm/utils/git/github-automation.py index aa4284c..3164371 100755 --- a/llvm/utils/git/github-automation.py +++ b/llvm/utils/git/github-automation.py @@ -185,7 +185,7 @@ class ReleaseWorkflow: 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() |