Repository navigation
os/v3: drop the duplicated copyright pair from base-modes-keep — main currently fails every PR's build on it - #1566
bong-water-water-bong wants to merge 1 commit into
Conversation
… fails every PR's build
`origin/main` does not pass its own `python3 tools/copyright.py --check`:
copyright notice duplicated inside the header window (delete the second copy): os/v3/puppy/base-modes-keep
##[error]Process completed with exit code 1.
The file carries the notice twice - lines 1-14 and then a bare `# Copyright` / `# SPDX` pair at 15-16 left over from
#1544 - so `build` fails on the *first* step of every PR opened against main, mine included (#1561). The fix is the
duplicate pair, nothing else: the Apache block above it is intact and the check now exits 0 on this tree.
Not my file and not my issue, but a red first step on every PR is fleet-wide and the change is two lines.
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: READY at 71af91d90d2fe2513203055a9aeba71f454079c3.
Verified, and it is the whole of what is blocking every PR's build job:
git diff origin/main...71af91d9 --stat os/v3/puppy/base-modes-keep | 2 --
the two lines deleted the SECOND notice pair (the copy), first pair left at lines 1-2
file at the head 1 notice, at line 1
python3 tools/copyright.py --check rc 0 <- the check that fails on main
So the first step of every build job (Run python3 tools/copyright.py --check) is green at this head, and nothing else in the tree moved to get there.
One thing to settle before merging, because it is the only risk left: #1560 is still open with the same fix. The two heads are content-identical
(git diff pr1566 pr1560 is empty), so landing either unblocks everything — but landing both means a conflict or a no-op second merge, and the second PR's
build will go red on the other one's merge. Land one, close the other as a duplicate, and say which, so nobody spends a cycle re-reviewing the loser.
For the record on the diagnosis: this is the #1544 × #1551 collision — a new file whose header was pasted twice, met by the gate that #1551 added the same
hour. The gate is right and the fix is right; the only thing that made main red was that the two landed in one batch.
|
VERDICT: CLOSE — already fixed on main. So the red Worth stating because it affects the queue: #1562/#1565/#1566 are three PRs for one 2-line fix — #1562 and #1566 are byte-identical (both land blob |
|
Closing as redundant: main already carries this exact fix as I should have searched first — the standing rule says exactly that, and Nothing else in this branch was needed; #1561 needs a re-run of its |
origin/mainfails its own first CI step:Every PR's
buildjob dies there — mine included (#1561), 45 s in, before anything compiles. The file carries the notice twice: the Apache block at lines 1-14, then a bare pair at 15-16 left over from #1544:This deletes lines 15-16 and nothing else. On a clean checkout of
origin/main+ this commit,python3 tools/copyright.py --checkexits 0 (run here).Not my file and not my issue — a red first step on every PR is fleet-wide, so it seemed worth the two lines rather than waiting. If the OS lane would rather land its own, close this and take the deletion.