Skip to content

Commit d90c348

Browse files
committed
fix(ci): preserve PR state on label add failure
1 parent 6aa17d8 commit d90c348

2 files changed

Lines changed: 31 additions & 15 deletions

File tree

‎.github/workflows/label-pr-review-state.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,19 @@ jobs:
183183
}
184184
const currentLabels = new Set(pr.labels.map(l => l.name));
185185
const labelErrors = [];
186+
if (desiredLabel && !currentLabels.has(desiredLabel)) {
187+
try {
188+
await github.rest.issues.addLabels({
189+
owner, repo, issue_number: pr.number, labels: [desiredLabel],
190+
});
191+
currentLabels.add(desiredLabel);
192+
pr.labels.push({ name: desiredLabel });
193+
} catch (err) {
194+
const error = new Error(`Could not add desired label: ${err.message}`);
195+
error.preserveStateLabels = true;
196+
throw error;
197+
}
198+
}
186199
for (const label of stateLabels) {
187200
if (label !== desiredLabel && currentLabels.has(label)) {
188201
try {
@@ -201,17 +214,6 @@ jobs:
201214
}
202215
}
203216
}
204-
if (desiredLabel && !currentLabels.has(desiredLabel)) {
205-
try {
206-
await github.rest.issues.addLabels({
207-
owner, repo, issue_number: pr.number, labels: [desiredLabel],
208-
});
209-
currentLabels.add(desiredLabel);
210-
pr.labels.push({ name: desiredLabel });
211-
} catch (err) {
212-
labelErrors.push(err);
213-
}
214-
}
215217
if (desiredLabel !== 'awaiting-author' && currentLabels.has('stale-awaiting-author')) {
216218
try {
217219
await github.rest.issues.removeLabel({
@@ -763,10 +765,12 @@ jobs:
763765
} catch (cleanupError) {
764766
metadataErrors.push(cleanupError);
765767
}
766-
try {
767-
await reconcileLabels(pr, null);
768-
} catch (cleanupError) {
769-
metadataErrors.push(cleanupError);
768+
if (!error.preserveStateLabels) {
769+
try {
770+
await reconcileLabels(pr, null);
771+
} catch (cleanupError) {
772+
metadataErrors.push(cleanupError);
773+
}
770774
}
771775
const detail = error.status
772776
? `${error.message} (HTTP ${error.status}${error.response?.data?.message ? `: ${error.response.data.message}` : ''})`

‎src/services/__tests__/pr-review-state-workflow.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,18 @@ describe("PR review-state workflow", () => {
923923
expect(result.addLabels).toHaveBeenCalledWith(expect.objectContaining({ labels: ["has-conflicts"] }))
924924
})
925925

926+
it("preserves awaiting-maintainer when adding has-conflicts fails", async () => {
927+
const result = await runWorkflow({
928+
conflict: true,
929+
labels: ["awaiting-maintainer"],
930+
addLabelsStatus: 500,
931+
})
932+
933+
expect(result.addLabels).toHaveBeenCalledWith(expect.objectContaining({ labels: ["has-conflicts"] }))
934+
expect(result.removeLabel).not.toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-maintainer" }))
935+
expect(result.setFailed).toHaveBeenCalledWith(expect.stringContaining("Could not add desired label"))
936+
})
937+
926938
it("rechecks mergeability before tagging a PR awaiting maintainer", async () => {
927939
const result = await runWorkflow({
928940
eventName: "push",

0 commit comments

Comments
 (0)