Skip to content

Commit 4d8a9d0

Browse files
committed
fix(ci): reject closed approved issues and classify renamed and bunfig files
1 parent 4a59642 commit 4d8a9d0

2 files changed

Lines changed: 41 additions & 2 deletions

File tree

‎.github/scripts/pr-admission.cjs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const IMPLEMENTATION_PREFIXES = [
1212
const IMPLEMENTATION_FILES = new Set([
1313
"package.json",
1414
"bun.lock",
15+
"bunfig.toml",
1516
"tsconfig.json",
1617
]);
1718

@@ -65,6 +66,7 @@ function needsApprovedIssue(changedFiles) {
6566
}
6667

6768
function issueIsApproved(issue) {
69+
if (issue.state !== "open") return false;
6870
return issue.labels.some((label) => {
6971
const name = typeof label === "string" ? label : label?.name;
7072
return name === "approved-for-work";

‎.github/scripts/pr-admission.test.cjs‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"use strict";
22

3+
const fs = require("node:fs");
4+
const path = require("node:path");
35
const { describe, it } = require("node:test");
46
const assert = require("node:assert/strict");
57
const {
@@ -10,6 +12,10 @@ const {
1012
needsApprovedIssue,
1113
} = require("./pr-admission.cjs");
1214

15+
function escapeRegExp(value) {
16+
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
17+
}
18+
1319
function completeBody() {
1420
return [
1521
"## Summary",
@@ -56,6 +62,7 @@ describe("needsApprovedIssue", () => {
5662
assert.equal(needsApprovedIssue(["src/router.ts"]), true);
5763
assert.equal(needsApprovedIssue(["gui/src/App.tsx"]), true);
5864
assert.equal(needsApprovedIssue(["package.json"]), true);
65+
assert.equal(needsApprovedIssue(["bunfig.toml"]), true);
5966
});
6067

6168
it("does not require one for documentation-only changes", () => {
@@ -81,7 +88,7 @@ describe("assessAdmission", () => {
8188
const failures = assessAdmission({
8289
body: completeBody(),
8390
changedFiles: ["src/router.ts"],
84-
linkedIssues: [{ number: 123, labels: ["bug"] }],
91+
linkedIssues: [{ number: 123, labels: ["bug"], state: "open" }],
8592
});
8693

8794
assert.deepEqual(failures, [
@@ -94,13 +101,27 @@ describe("assessAdmission", () => {
94101
body: completeBody(),
95102
changedFiles: ["src/router.ts"],
96103
linkedIssues: [
97-
{ number: 123, labels: [{ name: "approved-for-work" }] },
104+
{ number: 123, labels: [{ name: "approved-for-work" }], state: "open" },
98105
],
99106
});
100107

101108
assert.deepEqual(failures, []);
102109
});
103110

111+
it("rejects closed issues even when they carry the approval label", () => {
112+
const failures = assessAdmission({
113+
body: completeBody(),
114+
changedFiles: ["src/router.ts"],
115+
linkedIssues: [
116+
{ number: 123, labels: [{ name: "approved-for-work" }], state: "closed" },
117+
],
118+
});
119+
120+
assert.deepEqual(failures, [
121+
{ code: "issue_not_approved", issues: [123] },
122+
]);
123+
});
124+
104125
it("allows maintainers to perform integration work without an issue", () => {
105126
const failures = assessAdmission({
106127
body: completeBody(),
@@ -123,3 +144,19 @@ describe("assessAdmission", () => {
123144
assert.equal(failures[0].code, "missing_attestations");
124145
});
125146
});
147+
148+
describe("template parity", () => {
149+
it("keeps the PR template attestations in sync with REQUIRED_ATTESTATIONS", () => {
150+
const template = fs.readFileSync(
151+
path.join(__dirname, "..", "PULL_REQUEST_TEMPLATE.md"),
152+
"utf8",
153+
);
154+
for (const label of REQUIRED_ATTESTATIONS) {
155+
const pattern = new RegExp(
156+
`^\\s*[-*+]\\s+\\[[ xX]\\]\\s+${escapeRegExp(label)}\\s*$`,
157+
"m",
158+
);
159+
assert.match(template, pattern);
160+
}
161+
});
162+
});

0 commit comments

Comments
 (0)