Skip to content

Approve PR only after successful merge status #30

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
rupeshjSFDC merged 1 commit into from
Apr 29, 2026
Merged

Approve PR only after successful merge status #30

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
8 changes: 5 additions & 3 deletions cumulusci_ado/vcs/ado/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,10 @@ def can_auto_merge(self) -> bool:

if self.pull_request.merge_status == "succeeded":
self.repo.logger.info("Pull request can be automatically merged.")

if self.repo.config("pull_request_approve_on_merge"):
self.approve_pull_request()

return True

if self.pull_request.merge_status in ("conflicts", "failure"):
Expand All @@ -437,6 +441,7 @@ def can_auto_merge(self) -> bool:
self.repo.logger.info(
f"Current merge status: {self.pull_request.merge_status}. Retrying in {interval} seconds..."
)

time.sleep(interval)

self.repo.logger.warning(
Expand Down Expand Up @@ -477,9 +482,6 @@ def merge(self) -> None:
# Set auto-complete with completion options
self.set_auto_complete(completion_options)

if self.repo.config("pull_request_approve_on_merge"):
self.approve_pull_request()

def approve_pull_request(self) -> None:
"""Approves the pull request."""
try:
Expand Down
Loading