Skip to content

fix(github): keep review-required until required reviewers approve #32395

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
Yash-Singh1 merged 1 commit into from
Nov 7, 2026
Merged

fix(github): keep review-required until required reviewers approve #32395

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
14 changes: 14 additions & 0 deletions packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,20 @@ describe("pull request list decoding", () => {
]);
});

it("keeps review required when an approval falls short of the branch's required count", () => {
const batch = expectSuccess(
decodePullRequestListJson(
listJson([
{
reviewDecision: "REVIEW_REQUIRED",
latestReviews: [{ author: user("octocat"), state: "APPROVED" }],
},
]),
),
);
expect(batch.items.map((entry) => entry.reviewDecision)).toEqual(["review-required"]);
});

it("skips malformed entries but still counts them, so paging does not stop early", () => {
const batch = expectSuccess(
decodePullRequestListJson(listJson([{}, { number: "not-a-number" }])),
Expand Down
4 changes: 2 additions & 2 deletions packages/source-control-github/src/server/gitHubPullRequestJson.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ export function toPullRequestActionSummary(
};
}

/** GitHub's reviewDecision ignores reviews outside branch rules, including app approvals. */
/** Prefer GitHub's reviewDecision; only use latest reviews when it is absent (e.g. bot approvals). */
function toReviewDecisionWithReviews(
value: string | null | undefined,
reviews: ReadonlyArray<LatestReviewFields> | undefined,
Expand All @@ -518,7 +518,7 @@ function toReviewDecisionWithReviews(
if (summarized === "approved" || summarized === "changes-requested") return summarized;
const states = new Set((reviews ?? []).map((review) => review.state?.trim().toUpperCase() ?? ""));
if (states.has("CHANGES_REQUESTED")) return "changes-requested";
if (states.has("APPROVED")) return "approved";
if (summarized === null && states.has("APPROVED")) return "approved";
return summarized;
}

Expand Down
Loading