Skip to content

os/v3: drop the duplicated copyright pair from base-modes-keep — main currently fails every PR's build on it - #1566

Closed
bong-water-water-bong wants to merge 1 commit into
mainfrom
1bit/i669-copyright-dup
Closed

bong-water-water-bong wants to merge 1 commit into
mainfrom
1bit/i669-copyright-dup

Conversation

@bong-water-water-bong

Copy link
Copy Markdown
Collaborator

origin/main fails its own first CI step:

Run 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.

Every PR's build job 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:

14  # limitations under the License.
15  # Copyright 2026 bong-water-water-bong      <- duplicate
16  # SPDX-License-Identifier: Apache-2.0       <- duplicate
17  #
18  # Paths in the BASE Puppy layer that must stay group/other-writable (engine#1474). …

This deletes lines 15-16 and nothing else. On a clean checkout of origin/main + this commit, python3 tools/copyright.py --check exits 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.

… 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 bong-water-water-bong left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@bong-water-water-bong

Copy link
Copy Markdown
Collaborator Author

VERDICT: CLOSE — already fixed on main. main carries 1571366 "os: drop the duplicated notice in base-modes-keep, so the copyright gate passes on main (#1560)", and the file at that head has a single SPDX-License-Identifier with no duplicate pair. Verified just now on a main-based tree: python3 tools/copyright.py --check → rc=0.

So the red build this PR fixes no longer exists on the base. Nothing to merge here: rebasing this branch onto main would produce an empty diff.

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 59852cd8 for os/v3/puppy/base-modes-keep), and #1565 is a 3-line variant that lands a different blob. Merging more than one would conflict. All three are now superseded by #1560; closing them also stops new branches from inheriting the stale red gate (see my verdicts on #1563/#1568, whose build fails on this very message from their base).

@bong-water-water-bong

Copy link
Copy Markdown
Collaborator Author

Superseded by #1560 (merged as 1571366), which removed the same duplicated notice in os/v3/puppy/base-modes-keep; main is green again. Closing as a duplicate of the same fix.

@bong-water-water-bong

Copy link
Copy Markdown
Collaborator Author

Closing as redundant: main already carries this exact fix as 15713661 ("os: drop the duplicated notice in base-modes-keep, so the copyright gate passes on main (#1560)"), merged while I was filing. python3 tools/copyright.py --check exits 0 on origin/main as of now, which I re-ran before closing.

I should have searched first — the standing rule says exactly that, and gh pr list --search "base-modes-keep" would have shown #1560. Noting it here rather than just disappearing, because the duplicate is the cost this rule exists to avoid: four lanes did the same thing today.

Nothing else in this branch was needed; #1561 needs a re-run of its build job now that the base is green, not a change.

@bong-water-water-bong
bong-water-water-bong deleted the 1bit/i669-copyright-dup branch November 10, 2026 18:27
@bong-water-water-bong
bong-water-water-bong restored the 1bit/i669-copyright-dup branch November 11, 2026 03:37
@bong-water-water-bong
bong-water-water-bong deleted the 1bit/i669-copyright-dup branch November 12, 2026 21:06
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.

1 participant