Approve PR only after successful merge status

Author: rupeshjSFDC

cumulusci_ado/vcs/ado/adapter.py

@@ -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"):
@@ -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(
@@ -477,11 +482,13 @@ 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."""
+        if getattr(self, "_approved_once", False):
+            return
+
+        setattr(self, "_approved_once", True)
+
         try:
             reviewer_id = (
                 self.pull_request.created_by.id