Skip to content

Give the Surface repair its own migration timestamp - #14777

Closed
thebytorsnowdog wants to merge 1 commit into
omacom:fix/issue-7111from
thebytorsnowdog:contrib/pr-14541-migration-collision
Closed

thebytorsnowdog wants to merge 1 commit into
omacom:fix/issue-7111from
thebytorsnowdog:contrib/pr-14541-migration-collision

Conversation

@thebytorsnowdog

Copy link
Copy Markdown
Contributor

Follow-up to #14541. This PR targets fix/issue-7111, the existing PR's branch in omacom/omarchy, and contains only our correction on top of c501b37e3d22. The original PR remains responsible for bringing its feature and this follow-up into quattro.

Give the Surface module repair a migration filename separate from the repository-priority repair already shipped at 1791403252. The renamed 1791403253 migration keeps its behavior and ordering, with a matching machine-wide marker and fixture reference.

Add real ordered-runner regressions proving both migrations complete independently, an old priority marker does not hide Surface work, and failed rebuilds remain pending before later work. Mock the fixture DMI identity so these checks run headlessly. All 25 focused checks and the same 25 on a clean merge with Quattro 2519fd9 pass; the original filename still causes an add/add conflict and fails the new queue regression. The old per-user 3252 completion marker is ambiguous for old unmerged-branch testers; the old global marker remains specifically Surface-owned because repository priority uses no global marker. Neither is reused or deleted automatically, so old testers may receive one conservative extra Surface rebuild.

Submission status: the original PR and its branch were rechecked on 9 October 2026 and still match the tested head. Validation counts above describe the focused runs already recorded for this exact follow-up; they do not certify the complete parent PR or a running Omarchy desktop.

@greptile-apps

greptile-apps Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerConfidence Score: 5/5

[Medium impact] This follow-up appears safe to merge; no actionable issues were found.

Summary

Moves the Surface repair to 1791403253.sh and gives its machine-wide rebuild marker the matching timestamp.

  • The Surface repair runs after repository priority with its own completion marker.

No actionable issues were found. Tests were inspected but not executed during this review.

thebytorsnowdog explicitly acknowledged one conservative extra Surface rebuild for old branch testers. Old markers are intentionally neither reused nor deleted.

Reviews (1) · Last reviewed commit: "Give the Surface repair its own migratio..." · Reviewed by Greptile

@jandrusk

Copy link
Copy Markdown

Giving the Surface repair its own timestamp (1791403253) separate from the already-shipped 1791403252 priority repair is the right call — an add/add conflict on the same migration filename would be painful. The ordered-runner regressions look useful. Ready as a stacked follow-up on #14541.

@omarchybot

Copy link
Copy Markdown
Collaborator

Reviewed by Claude Opus 5.5 against the source, with nothing run on a worker. There was no second opinion: Codex Medium, the configured reviewer, refused because today's review budget is spent. So this one has no class label yet; it gets one when a second model has looked at it.

The collision you found is real. migrations/1791403252.sh on quattro is the migration that puts the Omarchy package repository ahead of Arch's, so the Surface repair in #14541 needs a timestamp of its own, and a machine that already ran the priority migration would otherwise never run the repair.

That fix is already on the pull request that will land instead. #14541 lost to the older #8151, and #8151 now carries the same Surface migration as migrations/1792129609.sh, with a rebuild marker of the same name and a test that covers the failed-rebuild retry. Since this pull request targets #14541's branch, merging it would not reach quattro.

The ordered-runner tests here exercise omarchy-migrate's per-filename bookkeeping through a copy of it edited with sed, rather than the Surface migration itself, so I have not proposed carrying them into #8151.

This waits on the maintainer, who decides #8151; once that lands, this and #14541 can be closed.

@thebytorsnowdog thebytorsnowdog closed this by deleting the head repository Nov 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants