Skip to content

[codex] fix auto-merge when no review is required #101

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
inferjay merged 1 commit into from
Oct 9, 2026
Merged

[codex] fix auto-merge when no review is required #101

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion scripts/auto_merge_android_download_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def merge_verified_pr(repo: str, number: int, head_sha: str, base_sha: str, *, a

_validate_pr(_get_json(pr_endpoint), _get_json(files_endpoint), repo, head_sha)
_validate_base_ref(repo, base_sha)
if _review_decision(repo, number) not in (None, "APPROVED"):
if _review_decision(repo, number) not in (None, "", "APPROVED"):
raise MergeBlocked("The PR requires review before merging")
_merge(repo, number, head_sha)

Expand Down
4 changes: 4 additions & 0 deletions tests/test_auto_merge_android_download_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ def test_merges_verified_bot_pr_after_cloudflare_success(self) -> None:
merge.assert_called_once_with(REPO, 123, HEAD)
sleep.assert_not_called()

def test_merges_when_no_review_is_required(self) -> None:
merge, _ = self.run_gate(review_decision="")
merge.assert_called_once_with(REPO, 123, HEAD)

def test_rejects_pr_from_other_author(self) -> None:
pr = copy.deepcopy(PR)
pr["user"]["login"] = "another-user"
Expand Down