Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/scripts/native-queue-policy.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const SHA = /^[a-f0-9]{40}$/;
const BLOCKED_LABEL = /^(hold|needs-human|release-in-progress|do-not-merge(?:\/.*)?)$/i;
const MAX_QUEUE_PAGES = 10;

const closedNoop = (pr) => `PR #${pr.number} is closed; nothing to evaluate`;

class PendingEvidence extends Error {}

function membersForGroup(entries, group) {
Expand Down Expand Up @@ -173,11 +175,11 @@ async function evaluate({ github, context }) {
const event = context.payload.pull_request;
const { data: pr } = await github.rest.pulls.get({ ...repo, pull_number: event.number });
// Post-merge label/comment edits re-fire this event; a closed PR has nothing to gate.
if (pr.state === 'closed') return `PR #${pr.number} is closed; nothing to evaluate`;
if (pr.state === 'closed') return closedNoop(pr);
assertEligible(pr, event.head.sha, event.base.ref);
await assertEvidence(github, repo, pr.number, pr.head.sha, POLICY_CHECKS);
const { data: current } = await github.rest.pulls.get({ ...repo, pull_number: event.number });
if (current.state === 'closed') return `PR #${current.number} is closed; nothing to evaluate`;
if (current.state === 'closed') return closedNoop(current);
assertEligible(current, event.head.sha, event.base.ref);
return `PR #${pr.number}: five existing policy providers succeeded on ${pr.head.sha}`;
}
Expand Down Expand Up @@ -219,5 +221,5 @@ async function evaluate({ github, context }) {

module.exports = {
ACTIONS_APP_ID, DCO_APP_ID, POLICY_CHECKS, BUILD_CHECKS,
PendingEvidence, membersForGroup, assertEligible, evidenceForHead, evaluate,
PendingEvidence, membersForGroup, assertEligible, evidenceForHead, closedNoop, evaluate,
};
6 changes: 3 additions & 3 deletions .github/scripts/native-queue-policy.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { test } = require('node:test');
const assert = require('node:assert/strict');
const {
ACTIONS_APP_ID, DCO_APP_ID, POLICY_CHECKS, BUILD_CHECKS,
PendingEvidence, membersForGroup, assertEligible, evidenceForHead, evaluate,
PendingEvidence, membersForGroup, assertEligible, evidenceForHead, closedNoop, evaluate,
} = require('./native-queue-policy.cjs');

const sha = n => n.toString(16).padStart(40, '0');
Expand Down Expand Up @@ -191,7 +191,7 @@ test('closed PR on pull_request_target passes as a no-op and skips evidence look
let lookups = 0;
const paginate = f.github.paginate;
f.github.paginate = async (...args) => { lookups++; return paginate(...args); };
assert.match(await evaluate(f), /PR #1 is closed; nothing to evaluate/);
assert.match(await evaluate(f), new RegExp(closedNoop(f.state.prs[0])));
assert.equal(lookups, 0);
});

Expand All @@ -204,7 +204,7 @@ test('PR closed during evidence wait passes as a no-op', async () => {
if (++reads === 2) res.data.state = 'closed';
return res;
};
assert.match(await evaluate(f), /is closed; nothing to evaluate/);
assert.match(await evaluate(f), new RegExp(closedNoop(f.state.prs[0])));
});

test('open PR with moved head still fails closed on pull_request_target', async () => {
Expand Down
Loading