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
12 changes: 10 additions & 2 deletions .github/workflows/label-pr-review-state.yml
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,16 @@ jobs:
continue;
}
if (latestPrDetail.mergeable === null || latestPrDetail.mergeable_state === 'unknown') {
desiredLabel = null;
phase = 'mergeability-pending';
try {
core.info(`PR #${pr.number}: mergeability pending — preserving current state labels`);
await updateReviewGate(pr, 'mergeability-pending', false);
await setCodeRabbitReviewActive(pr, false);
await updateReviewGuide(pr, 'mergeability-pending', existingGuide);
} catch (error) {
error.preserveStateLabels = true;
throw error;
}
continue;
}
}

Expand Down
32 changes: 29 additions & 3 deletions src/services/__tests__/pr-review-state-workflow.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -957,10 +957,10 @@ describe("PR review-state workflow", () => {
expect(result.addLabels).toHaveBeenCalledWith(expect.objectContaining({ labels: ["has-conflicts"] }))
})

it("does not tag a PR awaiting maintainer while mergeability is unknown", async () => {
it("preserves the current state while mergeability is unknown", async () => {
const result = await runWorkflow({
eventName: "push",
labels: ["awaiting-maintainer"],
labels: ["awaiting-maintainer", "coderabbit-review-active"],
mergeabilitySequence: [
{ mergeable: null, mergeableState: "unknown" },
{ mergeable: null, mergeableState: "unknown" },
Expand All @@ -975,9 +975,35 @@ describe("PR review-state workflow", () => {
],
})

expect(result.removeLabel).toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-maintainer" }))
expect(result.removeLabel).not.toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-maintainer" }))
expect(result.removeLabel).toHaveBeenCalledWith(expect.objectContaining({ name: "coderabbit-review-active" }))
expect(result.addLabels).not.toHaveBeenCalledWith(expect.objectContaining({ labels: ["awaiting-maintainer"] }))
expect(latestGateStatus(result)?.description).toContain("calculating mergeability")
expect(latestGuide(result)).toContain("calculating mergeability")
})

it("preserves the current state when pending mergeability metadata cannot be updated", async () => {
const result = await runWorkflow({
eventName: "push",
labels: ["awaiting-maintainer", "coderabbit-review-active"],
mergeabilitySequence: [
{ mergeable: null, mergeableState: "unknown" },
{ mergeable: null, mergeableState: "unknown" },
],
removeLabelStatus: 500,
reviews: [
{
login: "coderabbitai[bot]",
type: "Bot",
state: "APPROVED",
submittedAt: REVIEWED_AT,
},
],
})

expect(result.removeLabel).toHaveBeenCalledWith(expect.objectContaining({ name: "coderabbit-review-active" }))
expect(result.removeLabel).not.toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-maintainer" }))
expect(result.setFailed).toHaveBeenCalledWith(expect.stringContaining("Remove label failed"))
})

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