Skip to content

fix(land): requeue comments say why, without a blanket flaky follow-up #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moq-bot merged 3 commits into from
Oct 31, 2026
Merged

fix(land): requeue comments say why, without a blanket flaky follow-up #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20258ed
fix(land): requeue comments say why, without a blanket flaky follow-up
kixelated Oct 31, 2026
ddb682e
test(land): a requeue comment carries the fixer's reason
kixelated Oct 31, 2026
e4e29a8
quest land: merge tested base
Oct 31, 2026
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
3 changes: 2 additions & 1 deletion assets/land-fix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ result—hand back that PR, quoting the attempt and its location in the diagnosi
## Mechanical fixes

The repository has `batch`, `base`, and one `pr-<number>` branch per pinned PR.
For each PR, requeue it unchanged if healthy (including a flaky failure), commit a
For each PR, requeue it unchanged if healthy (if the failure was flaky, name the
flaky test in the reason so it can be followed up), commit a
mechanical fix on its own branch, or hand it back with diagnosis and recommendation.
Allowed fixes: preserve both sides' intent in conflicts, format/lint, regenerate
lockfiles/generated files, or follow a base rename. Merge base where practical.
Expand Down
3 changes: 2 additions & 1 deletion src/cli/land-fixer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,8 @@ async function collectJob(
github,
job.plan,
entry,
`Requeued unchanged: ${result.reason.slice(0, 200)}. Suggested follow-up: investigate the batch failure and stabilize any flaky checks.`,
// The reason says why: another PR in the batch, or a flaky check worth a follow-up.
`Requeued unchanged: ${result.reason.slice(0, 200)}`,
"requeue",
author(result),
);
Expand Down
4 changes: 2 additions & 2 deletions test/land.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,14 +1667,14 @@ printf '[{"number":1,"action":"fixed","head":"%s","reason":"preserve both confli

describe("asynchronous land fixer", () => {
afterEach(() => vi.unstubAllEnvs());
test("requeues unchanged, suggests follow-up, and hands back a second ejection in the same pick", async () => {
test("requeues unchanged with its reason, and hands back a second ejection in the same pick", async () => {
const fixture = await fixerFixture(requeueScript);
await fixture.finished;
expect(await fixture.collect()).toEqual(["requeued 1"]);
expect(fixture.pull.head).toBe(fixture.plan.queue[0].head);
expect(fixture.pull.autoMerge?.commitBody).toBe(pin(fixture.pull.head!));
expect(fixture.pull.labels).toContain("quest:merge");
expect(fixture.forge.comment(1)).toContain("Suggested follow-up");
expect(fixture.forge.comment(1)).toContain("Requeued unchanged:");
const next = await resolveQueue(REPOSITORY, undefined, fixture.deps);
await serveBatch(
fixture.root,
Expand Down
Loading