Skip to content

QVAC-18613 infra: recognise verified label as explicit tier 1 in approval bot #2006

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

Closed
Proletter wants to merge 2 commits into from
Closed

QVAC-18613 infra: recognise verified label as explicit tier 1 in approval bot #2006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c39ae0
QVAC-18613 infra: recognise verified label as explicit tier 1 in appr…
Proletter May 12, 2026
9c7b2a0
Merge branch 'main' into feat/QVAC-18613-approval-bot-verified-tier-1
Proletter May 18, 2026
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
37 changes: 30 additions & 7 deletions .github/workflows/approval-check-worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ jobs:
context,
approvals,
tier,
prNumber
prNumber,
tierSource
) {
const { teamMemberApprovals, teamLeadApprovals, managementApprovals } = approvals;

Expand Down Expand Up @@ -289,7 +290,8 @@ jobs:
approvals,
tier,
prNumber,
bypass ? bypassReason : null
bypass ? bypassReason : null,
tierSource
);
return { requirementsMet, statusMessage };
}
Expand All @@ -302,7 +304,8 @@ jobs:
approvals,
tier,
prNumber,
bypassReason
bypassReason,
tierSource
) {
console.log(`\nStatus: ${statusMessage}`);

Expand Down Expand Up @@ -353,6 +356,7 @@ jobs:
const commentBody = `## Tier-based Approval Status

**PR Tier:** ${tier.toUpperCase()}
**Tier source:** ${tierSource}

**Current Status:** ${requirementsMet ? "✅ APPROVED" : "❌ PENDING"}

Expand Down Expand Up @@ -390,17 +394,36 @@ jobs:
// Get PR labels
const labels = approvals.pr.labels.map(label => label.name);

// Determine tier - default to tier1 if no label
// Determine tier and a human-readable source for the bot comment.
//
// - `verified` -> explicit tier 1 (set by label-gate / a
// trusted reviewer; QVAC-18613).
// - `tier2` -> tier 2 (unchanged from previous
// behaviour).
// - both labels present -> `tier2` wins. Stricter requirements
// take priority when there is a conflict.
// - neither -> default tier 1 (unchanged from
// previous behaviour).
const hasVerified = labels.includes('verified');
const hasTier2 = labels.includes('tier2');

let tier = 'tier1';
if (labels.includes('tier2')) {
let tierSource = 'default (no tier label applied)';
if (hasVerified) {
tierSource = '`verified` label applied (explicit tier 1)';
}
if (hasTier2) {
tier = 'tier2';
tierSource = hasVerified
? '`tier2` label applied (overrides `verified`)'
: '`tier2` label applied';
}

console.log(`PR #${prNumber} is classified as: ${tier}`);
console.log(`PR #${prNumber} is classified as: ${tier} (${tierSource})`);
console.log(`PR Labels: ${labels.join(', ')}`);

// Check requirements
const result = checkTierRequirements(github, context, approvals, tier, prNumber);
const result = checkTierRequirements(github, context, approvals, tier, prNumber, tierSource);

console.log(`Repository: ${approvals.repoOwningTeam}`);
console.log(result.statusMessage);
Expand Down