Skip to content

[automerge] Fix creation of Pull Requests for conflicts #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2025
Merged

[automerge] Fix creation of Pull Requests for conflicts #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion arm-software/ci/automerge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ class Git:
def __init__(self, repo_path: Path) -> None:
self.repo_path = repo_path

def get_repo_path(self) -> Path:
return self.repo_path

def run_cmd(self, args: list[str], check: bool = True) -> str:
git_cmd = ["git", "-C", str(self.repo_path)] + args
git_process = subprocess.run(git_cmd, check=check, capture_output=True, text=True)
Expand Down Expand Up @@ -98,7 +101,9 @@ def create_pull_request(git_repo: Git, to_branch: str) -> None:
log_output = git_repo.run_cmd(["log", "HEAD", "--max-count=1", "--pretty=format:%s"])
pr_title = f"Automerge conflict: {log_output}"
subprocess.run(
["gh", "pr", "create", "--head", AUTOMERGE_BRANCH, "--base", to_branch, "--fill", "--title", pr_title],
["gh", "pr", "create", "--head", AUTOMERGE_BRANCH, "--base", to_branch, "--fill", "--title", pr_title,
"--label", MERGE_CONFLICT_LABEL],
cwd=git_repo.get_repo_path(),
check=True,
)

Expand Down