diff --git a/webhook_server/libs/github_api.py b/webhook_server/libs/github_api.py index d68f5e88..038367fd 100644 --- a/webhook_server/libs/github_api.py +++ b/webhook_server/libs/github_api.py @@ -1262,7 +1262,7 @@ def check_if_can_be_merged(self) -> None: try: self.logger.info(f"{self.log_prefix} Check if {CAN_BE_MERGED_STR}.") - self.set_merge_check_queued() + self.set_merge_check_in_progress() last_commit_check_runs = list(self.last_commit.get_check_runs()) _labels = self.pull_request_labels_names() self.logger.debug(f"{self.log_prefix} check if can be merged. PR labels are: {_labels}") @@ -1984,8 +1984,8 @@ def get_all_approvers(self) -> list[str]: def get_all_reviewers(self) -> list[str]: _reviewers: list[str] = [] for list_of_reviewers in self.owners_data_for_changed_files().values(): - for _approver in list_of_reviewers.get("reviewers", []): - _reviewers.append(_approver) + for _reviewer in list_of_reviewers.get("reviewers", []): + _reviewers.append(_reviewer) _reviewers.sort() return _reviewers @@ -2132,7 +2132,7 @@ def _check_if_pr_approved(self, labels: list[str]) -> str: approved_by = [] lgtm_count: int = 0 - all_reviewers = self.all_reviewers.copy() + all_reviewers = self.all_reviewers.copy() + self.root_approvers.copy() + self.root_reviewers.copy() all_reviewers_without_pr_owner = { _reviewer for _reviewer in all_reviewers if _reviewer != self.parent_committer }