fix(fork): green the ownership coverage check on main - #967
Merged
Conversation
`make fork-ownership-coverage-check` fails on main with two errors: - `last_verified_fork_head` (`e60a6616a0f`, #777) is not an ancestor of `origin/main`. Every upstream rebase rewrites fork SHAs, so the cursor orphans itself each cycle. - `Template/Stack/noodle-gallery.yml` (#942) is a new top-level directory that no glob covers. Declare `Template/**` under `release-ci-and-infrastructure` (fork-only — absent from `upstream/main`) and bump the cursor to current `origin/main`.
Deeds67
added a commit
that referenced
this pull request
Aug 10, 2026
`make fork-ownership-coverage-check` fails on main with two errors: - `last_verified_fork_head` (`e60a6616a0f`, #777) is not an ancestor of `origin/main`. Every upstream rebase rewrites fork SHAs, so the cursor orphans itself each cycle. - `Template/Stack/noodle-gallery.yml` (#942) is a new top-level directory that no glob covers. Declare `Template/**` under `release-ci-and-infrastructure` (fork-only — absent from `upstream/main`) and bump the cursor to current `origin/main`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
make fork-ownership-coverage-checkcurrently fails onmainwith two errors:Changes
Template/**underrelease-ci-and-infrastructure. feat(portainer): add app-template stackfile #942 added a new top-leveldirectory, which no glob covered. Confirmed fork-only — the path is absent from
upstream/main.last_verified_fork_headto99ce9f8b46e. The previous value (e60a6616a0f, fix(people): one merge policy for every merge path (#733) #777) wasorphaned: every upstream rebase rewrites fork SHAs, so a cursor pointing at a fork commit stops
being an ancestor of
origin/mainafter the next cycle.Verification
make fork-ownership-coverage-checkcovers 3321 fork filesmake ci-invariants-checkmake fork-patches-checkprettier --check docs/fork/ownership.ymltools/upstream-preflighttests: 232/235. The 3batch.spec.tsfailures reproduce identically onan unmodified tree and
test.ymlis green onmainat the same SHA, so they are local-environmentonly and untouched here.
Notes
The cursor bump is a treadmill, not a cure — the next rebase orphans
99ce9f8b46ethe same way, andthis is the third recorded occurrence. Keying the cursor on something rebase-stable would fix the
class; that is a design change and deliberately out of scope here.
None of these checks run in CI today (they fire only when a rebase starts), so
maincan drift redagain unnoticed. Wiring the three cheap ones into
test.ymlis a separate follow-up.