Skip to content

fix(review-bot): use GitHub reviewDecision as source of truth for approval #339

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
nourshoreibah merged 1 commit into from
Aug 22, 2026
Merged

fix(review-bot): use GitHub reviewDecision as source of truth for approval #339

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
45 changes: 31 additions & 14 deletions .github/workflows/pr-review-status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,17 @@ jobs:
commented: 'Commented',
};

function buildBlocks({ prUrl, prNumber, prTitle, prAuthor, reviewers, alwaysReviewer }) {
function buildBlocks({ prUrl, prNumber, prTitle, prAuthor, reviewers, alwaysReviewer, approvalMet, anyChangesRequested }) {
const participantStatuses = [
...reviewers.map(r => r.status),
...(alwaysReviewer ? [alwaysReviewer.status] : []),
];
const allDone = participantStatuses.every(status => status !== 'pending');
const anyChangesRequested = participantStatuses.includes('changes_requested');
const approvalMet = participantStatuses.includes('approved') && !anyChangesRequested;

let headerText;
if (approvalMet) {
headerText = ':approved: Approval Requirement Met';
} else if (allDone && anyChangesRequested) {
} else if (anyChangesRequested) {
headerText = ':git-request-changes: Changes Requested';
} else if (allDone) {
headerText = ':white_check_mark: All Reviews Complete';
Expand Down Expand Up @@ -158,6 +156,29 @@ jobs:
console.log(`Could not fetch reviews: ${err.message}`);
}

// ── GitHub is the source of truth for "is this approved" ─────────
// reviewDecision folds in required_approving_review_count, code-owner
// rules, and dismissals — so this tracks branch protection even if
// it changes without a corresponding edit here.
let reviewDecision = null;
try {
const result = await github.graphql(
`query($owner: String!, $repo: String!, $number: Int!) {
repository(owner: $owner, name: $repo) {
pullRequest(number: $number) { reviewDecision }
}
}`,
{ owner: context.repo.owner, repo: context.repo.repo, number: prNumber }
);
reviewDecision = result.repository.pullRequest.reviewDecision;
} catch (err) {
console.log(`Could not fetch reviewDecision: ${err.message}`);
}
console.log(`GitHub reviewDecision for PR #${prNumber}: ${reviewDecision}`);

const approvalMet = reviewDecision === 'APPROVED';
const anyChangesRequested = reviewDecision === 'CHANGES_REQUESTED';

const REVIEW_STATES = ['APPROVED', 'CHANGES_REQUESTED', 'COMMENTED'];

function getLatestStatus(login) {
Expand Down Expand Up @@ -194,23 +215,19 @@ jobs:
}
}

const participantStatuses = [
...reviewerObjs.map(r => r.status),
...(alwaysReviewerObj ? [alwaysReviewerObj.status] : []),
];
const mainDone = mainStatus !== 'pending';
const secondDone = !prData.second_reviewer || secondStatus !== 'pending';
const alwaysDone = !alwaysReviewerObj || alwaysReviewerObj.status !== 'pending';
const allDone = mainDone && secondDone && alwaysDone;
const anyChangesRequested = participantStatuses.includes('changes_requested');
const approvalMet = participantStatuses.includes('approved') && !anyChangesRequested;

// ── Update original Slack message with current statuses ──────────
if (prData.slack_thread_ts) {
const blocks = buildBlocks({
prUrl, prNumber, prTitle, prAuthor: prData.author,
reviewers: reviewerObjs,
alwaysReviewer: alwaysReviewerObj,
approvalMet,
anyChangesRequested,
});

await slackApi('chat.update', {
Expand Down Expand Up @@ -241,23 +258,23 @@ jobs:
const dmBlocks = [
{
type: 'header',
text: { type: 'plain_text', text: ':approved: Your PR is Fully Approved', emoji: true },
text: { type: 'plain_text', text: ':approved: Your PR is Approved', emoji: true },
},
{
type: 'section',
text: {
type: 'mrkdwn',
text: `*<${prUrl}|#${prNumber} ${prTitle}>* has been approved by all reviewers and is ready to merge!`,
text: `*<${prUrl}|#${prNumber} ${prTitle}>* has met the required approvals and is ready to merge!`,
},
},
];

await slackApi('chat.postMessage', {
channel: authorSlackId,
text: `PR #${prNumber} is fully approved and ready to merge!`,
text: `PR #${prNumber} is approved and ready to merge!`,
blocks: dmBlocks,
});
console.log(`DM'd author ${prData.author} (${authorSlackId}) — PR #${prNumber} fully approved`);
console.log(`DM'd author ${prData.author} (${authorSlackId}) — PR #${prNumber} approval requirement met`);
}

// ── Update bot state when approval requirement is met or all done ─
Expand Down
29 changes: 21 additions & 8 deletions .github/workflows/pr-reviewer-remind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,31 @@ jobs:
}
}

const participantStates = [
mainState,
secondState,
alwaysState,
].filter(Boolean);

const mainDone = mainState !== null;
const secondDone = !prData.second_reviewer || secondState !== null;
const alwaysDone = authorIsAlways || alwaysState !== null;
const allDone = mainDone && secondDone && alwaysDone;
const anyChangesRequested = participantStates.includes('CHANGES_REQUESTED');
const approvalMet = participantStates.includes('APPROVED') && !anyChangesRequested;

// ── GitHub is the source of truth for "is this approved" ──
// reviewDecision folds in required_approving_review_count,
// code-owner rules, and dismissals — so this tracks branch
// protection even if it changes without a matching edit here.
let reviewDecision = null;
try {
const result = await github.graphql(
`query($owner: String!, $repo: String!, $number: Int!) {
repository(owner: $owner, name: $repo) {
pullRequest(number: $number) { reviewDecision }
}
}`,
{ owner: prOwner, repo: prRepo, number: prData.pr_number }
);
reviewDecision = result.repository.pullRequest.reviewDecision;
} catch (err) {
console.log(`Could not fetch reviewDecision for PR #${prData.pr_number}: ${err.message}`);
}

const approvalMet = reviewDecision === 'APPROVED';

if (approvalMet || allDone) {
console.log(`PR #${prData.pr_number}: completion criteria reached. Done.`);
Expand Down
Loading