Skip to content

Commit 042b8b9

Browse files
authored
Merge pull request #101 from inferjay/codex/fix-auto-merge-review-decision
[codex] fix auto-merge when no review is required
2 parents 2f453b1 + 4002c83 commit 042b8b9

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎scripts/auto_merge_android_download_pr.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def merge_verified_pr(repo: str, number: int, head_sha: str, base_sha: str, *, a
110110

111111
_validate_pr(_get_json(pr_endpoint), _get_json(files_endpoint), repo, head_sha)
112112
_validate_base_ref(repo, base_sha)
113-
if _review_decision(repo, number) not in (None, "APPROVED"):
113+
if _review_decision(repo, number) not in (None, "", "APPROVED"):
114114
raise MergeBlocked("The PR requires review before merging")
115115
_merge(repo, number, head_sha)
116116

‎tests/test_auto_merge_android_download_pr.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ def test_merges_verified_bot_pr_after_cloudflare_success(self) -> None:
8282
merge.assert_called_once_with(REPO, 123, HEAD)
8383
sleep.assert_not_called()
8484

85+
def test_merges_when_no_review_is_required(self) -> None:
86+
merge, _ = self.run_gate(review_decision="")
87+
merge.assert_called_once_with(REPO, 123, HEAD)
88+
8589
def test_rejects_pr_from_other_author(self) -> None:
8690
pr = copy.deepcopy(PR)
8791
pr["user"]["login"] = "another-user"

0 commit comments

Comments
 (0)