Skip to content

Commit 87da02e

Browse files
committed
fix: preserve PR labels while mergeability is pending
1 parent 313ca59 commit 87da02e

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,11 @@ jobs:
721721
continue;
722722
}
723723
if (latestPrDetail.mergeable === null || latestPrDetail.mergeable_state === 'unknown') {
724-
desiredLabel = null;
725-
phase = 'mergeability-pending';
724+
core.info(`PR #${pr.number}: mergeability pending — preserving current state labels`);
725+
await updateReviewGate(pr, 'mergeability-pending', false);
726+
await setCodeRabbitReviewActive(pr, false);
727+
await updateReviewGuide(pr, 'mergeability-pending', existingGuide);
728+
continue;
726729
}
727730
}
728731

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -957,10 +957,10 @@ describe("PR review-state workflow", () => {
957957
expect(result.addLabels).toHaveBeenCalledWith(expect.objectContaining({ labels: ["has-conflicts"] }))
958958
})
959959

960-
it("does not tag a PR awaiting maintainer while mergeability is unknown", async () => {
960+
it("preserves the current state while mergeability is unknown", async () => {
961961
const result = await runWorkflow({
962962
eventName: "push",
963-
labels: ["awaiting-maintainer"],
963+
labels: ["awaiting-maintainer", "coderabbit-review-active"],
964964
mergeabilitySequence: [
965965
{ mergeable: null, mergeableState: "unknown" },
966966
{ mergeable: null, mergeableState: "unknown" },
@@ -975,9 +975,11 @@ describe("PR review-state workflow", () => {
975975
],
976976
})
977977

978-
expect(result.removeLabel).toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-maintainer" }))
978+
expect(result.removeLabel).not.toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-maintainer" }))
979+
expect(result.removeLabel).toHaveBeenCalledWith(expect.objectContaining({ name: "coderabbit-review-active" }))
979980
expect(result.addLabels).not.toHaveBeenCalledWith(expect.objectContaining({ labels: ["awaiting-maintainer"] }))
980981
expect(latestGateStatus(result)?.description).toContain("calculating mergeability")
982+
expect(latestGuide(result)).toContain("calculating mergeability")
981983
})
982984

983985
it("routes CodeRabbit change requests back to the author", async () => {

0 commit comments

Comments
 (0)