Skip to content

Commit

Permalink
[Fix](ci)When the automatic cherry-pick fails, delete the temporary b…
Browse files Browse the repository at this point in the history
…ranch
  • Loading branch information
CalvinKirs committed Dec 27, 2024
1 parent ddb727f commit c67c1f5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/auto-pick-script.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,7 @@
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.")
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)

0 comments on commit c67c1f5

Please sign in to comment.