Skip to content

Set PR as auto-merge when committer is part of auth-merged users #574

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
myakove merged 1 commit into from
Sep 30, 2024
Merged

Set PR as auto-merge when committer is part of auth-merged users #574

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
32 changes: 21 additions & 11 deletions webhook_server_container/libs/github_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,7 @@ def process_pull_request_webhook_data(self) -> None:
pull_request_opened_futures.append(executor.submit(self.process_opened_or_synchronize_pull_request))
if self.jira_track_pr:
pull_request_opened_futures.append(executor.submit(self.create_jira_when_open_pull_reques))
pull_request_opened_futures.append(executor.submit(self.set_pull_request_automerge))

for _ in as_completed(pull_request_opened_futures):
pass
Expand Down Expand Up @@ -1422,17 +1423,17 @@ def check_if_can_be_merged(self) -> None:
if pr_approved and not failure_output:
self._add_label(label=CAN_BE_MERGED_STR)
self.set_merge_check_success()
if self.parent_committer in self.auto_verified_and_merged_users:
self.logger.info(
f"{self.log_prefix} will be merged automatically. owner: {self.parent_committer} "
f"is part of {self.auto_verified_and_merged_users}"
)
self.pull_request.create_issue_comment(
f"Owner of the pull request {self.parent_committer} "
f"is part of:\n`{self.auto_verified_and_merged_users}`\n"
"Pull request is merged automatically."
)
self.pull_request.merge(merge_method="squash")
# if self.parent_committer in self.auto_verified_and_merged_users:
# self.logger.info(
# f"{self.log_prefix} will be merged automatically. owner: {self.parent_committer} "
# f"is part of {self.auto_verified_and_merged_users}"
# )
# self.pull_request.create_issue_comment(
# f"Owner of the pull request {self.parent_committer} "
# f"is part of:\n`{self.auto_verified_and_merged_users}`\n"
# "Pull request is merged automatically."
# )
# self.pull_request.merge(merge_method="squash")

self.logger.info(f"{self.log_prefix} Pull request can be merged")
return
Expand Down Expand Up @@ -2008,3 +2009,12 @@ def add_pull_request_owner_as_assingee(self) -> None:
except Exception:
if self.approvers:
self.pull_request.add_to_assignees(self.approvers[0])

def set_pull_request_automerge(self) -> None:
if self.parent_committer in self.auto_verified_and_merged_users:
self.logger.info(
f"{self.log_prefix} will be merged automatically. owner: {self.parent_committer} "
f"is part of {self.auto_verified_and_merged_users}"
)

self.pull_request.enable_automerge(merge_method="SQUASH")