This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0eca2c25d7e [Fix](ci)When the automatic cherry-pick fails, delete the
temporary branch (#46103)
0eca2c25d7e is described below
commit 0eca2c25d7e0665bee844f415ab3fb97920b507d
Author: Calvin Kirs <guoqi...@selectdb.com>
AuthorDate: Fri Dec 27 18:07:21 2024 +0800
[Fix](ci)When the automatic cherry-pick fails, delete the temporary branch
(#46103)
---
tools/auto-pick-script.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/auto-pick-script.py b/tools/auto-pick-script.py
index 19766a269c4..b8bb9358820 100644
--- a/tools/auto-pick-script.py
+++ b/tools/auto-pick-script.py
@@ -110,4 +110,7 @@ except subprocess.CalledProcessError:
print(f"Conflict occurred while cherry-picking commit {merge_commit_sha}.")
# Add conflict label
pr.add_to_labels(CONFLICT_LABEL)
- print(f"Added label '{CONFLICT_LABEL}' to PR #{pr.number} due to
conflict.")
\ No newline at end of file
+ print(f"Added label '{CONFLICT_LABEL}' to PR #{pr.number} due to
conflict.")
+ subprocess.run(["git", "checkout", "master", "-f"], cwd=repo_dir,
check=True)
+ subprocess.run(["git", "branch", "-D", new_branch_name], cwd=repo_dir)
+ subprocess.run(["git", "push", "origin", "--delete", new_branch_name],
cwd=repo_dir)
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
