From 60e8da18755a85be5b71865cb32e4908efda69eb Mon Sep 17 00:00:00 2001 From: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 19:47:24 -0400 Subject: [PATCH 1/6] fix: waive mismatched sign-off for the remaining v5 odttlnt commits Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --- .github/workflows/dco-post-merge.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dco-post-merge.yml b/.github/workflows/dco-post-merge.yml index 844efd9b01..d9e568f7cf 100644 --- a/.github/workflows/dco-post-merge.yml +++ b/.github/workflows/dco-post-merge.yml @@ -308,6 +308,16 @@ env: # disposition. Expect STALE-WAIVER once the contributor's next commit lands # under the work address; remove the entry then. + # 003144299b952e53290088e7637ac12f6d5d20e9, 8eb7267d3302bb3f68e718f4caf57826efb88ae3 + # and 3fedd0f3cbf5703a306157411a7136ecff738f5c — further v5 squashes with + # the same mismatched-signoff shape and the same person as 687c3cb0 above: + # author Sachin Naik <91499691+odttlnt@users.noreply.github.com>, sign-off + # sachin.naik@ibm.com. Reported by the monitor in #15542. Protected v5 + # history cannot be re-signed in place and no sign-off is added on the + # contributor's behalf, so these are waived per commit. Accepted by + # maintainer disposition in #15542: the maintainer merging the PR that adds + # these entries IS that disposition. Reversible: remove the entries. + # KNOWN FAILING COMMITS THAT ARE DELIBERATELY *NOT* WAIVED # # Deep history carries further genuine mismatches — 8b536911 and, on v5 @@ -319,7 +329,7 @@ env: # regression. They are intentionally left unwaived: pre-approving them would # grow this list for commits that are not actually being reported, which is # the exact failure mode #6770 was filed about. - DCO_WAIVED_COMMITS: 'b798382a4d98ada28b0cb813644a595db0c58b08 7e01fee4a2c1a37f4a4072bf2d17e76e27113d01 d8f376e8e95f7b0c7d48d2b05b3a2a07ac9ee69b 4b9261183378a1a02a921cd0cc9df31e6f37993b 01bd2469e7a4022fff3fc04c42226c4d90c2f410 e29343efbb6e0721ca665ed8bd587d08997325e2 a8104b0cbeee1c4ac41034ac3f9951e6b5ac1200 692d068ffa198895ab91bd7ad663971f2b8ad358 b893b01c90e6ffff951523d20b19e9dfbfa80184 a0de3f920ded7e0cfc287bb5009d542e5a14f014 c6c78c3a26c33c6d1530996df20ead0a6b699dda a9200f3d278fcdbf6291f37f921845113814686e fb153585e6dab7b6f6808cb328e706d691f9be79 00070300002c88fda6850278edaea2498e8ca941 511027d8174be02b1dd77c25e9f8d5265f7fb7d4 687c3cb006d7559135f5f2fb0db13476d1af2a43' + DCO_WAIVED_COMMITS: 'b798382a4d98ada28b0cb813644a595db0c58b08 7e01fee4a2c1a37f4a4072bf2d17e76e27113d01 d8f376e8e95f7b0c7d48d2b05b3a2a07ac9ee69b 4b9261183378a1a02a921cd0cc9df31e6f37993b 01bd2469e7a4022fff3fc04c42226c4d90c2f410 e29343efbb6e0721ca665ed8bd587d08997325e2 a8104b0cbeee1c4ac41034ac3f9951e6b5ac1200 692d068ffa198895ab91bd7ad663971f2b8ad358 b893b01c90e6ffff951523d20b19e9dfbfa80184 a0de3f920ded7e0cfc287bb5009d542e5a14f014 c6c78c3a26c33c6d1530996df20ead0a6b699dda a9200f3d278fcdbf6291f37f921845113814686e fb153585e6dab7b6f6808cb328e706d691f9be79 00070300002c88fda6850278edaea2498e8ca941 511027d8174be02b1dd77c25e9f8d5265f7fb7d4 687c3cb006d7559135f5f2fb0db13476d1af2a43 003144299b952e53290088e7637ac12f6d5d20e9 8eb7267d3302bb3f68e718f4caf57826efb88ae3 3fedd0f3cbf5703a306157411a7136ecff738f5c' # Tide/tagged-release failures discussed in #6276 came from human squash # commits and release metadata, not bot-authored commits. Skip bots here so # release automation is not paged for bracketed bot-address edge cases that From d10bb254fc962bfd31ab21138336dbf24c145620 Mon Sep 17 00:00:00 2001 From: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 19:56:50 -0400 Subject: [PATCH 2/6] fix: document each waived v5 SHA on its own rationale line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The waiver integrity self-test extracts one full SHA per '# — ' line, so a combined rationale left the three new entries undocumented. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --- .github/workflows/dco-post-merge.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dco-post-merge.yml b/.github/workflows/dco-post-merge.yml index d9e568f7cf..c681aab0ec 100644 --- a/.github/workflows/dco-post-merge.yml +++ b/.github/workflows/dco-post-merge.yml @@ -308,15 +308,20 @@ env: # disposition. Expect STALE-WAIVER once the contributor's next commit lands # under the work address; remove the entry then. - # 003144299b952e53290088e7637ac12f6d5d20e9, 8eb7267d3302bb3f68e718f4caf57826efb88ae3 - # and 3fedd0f3cbf5703a306157411a7136ecff738f5c — further v5 squashes with - # the same mismatched-signoff shape and the same person as 687c3cb0 above: - # author Sachin Naik <91499691+odttlnt@users.noreply.github.com>, sign-off + # 003144299b952e53290088e7637ac12f6d5d20e9 — v5 squash with the same + # mismatched-signoff shape and the same person as 687c3cb0 above: author + # Sachin Naik <91499691+odttlnt@users.noreply.github.com>, sign-off # sachin.naik@ibm.com. Reported by the monitor in #15542. Protected v5 # history cannot be re-signed in place and no sign-off is added on the - # contributor's behalf, so these are waived per commit. Accepted by - # maintainer disposition in #15542: the maintainer merging the PR that adds - # these entries IS that disposition. Reversible: remove the entries. + # contributor's behalf, so it is waived per commit. Accepted by maintainer + # disposition in #15542: the maintainer merging the PR that adds this entry + # IS that disposition. Reversible: remove the entry. + + # 8eb7267d3302bb3f68e718f4caf57826efb88ae3 — same shape, person and + # disposition as 003144299b above (#15542). Reversible: remove the entry. + + # 3fedd0f3cbf5703a306157411a7136ecff738f5c — same shape, person and + # disposition as 003144299b above (#15542). Reversible: remove the entry. # KNOWN FAILING COMMITS THAT ARE DELIBERATELY *NOT* WAIVED # From c88aaa99421ac25ae48ab1f757d7b9b258cf4b9e Mon Sep 17 00:00:00 2001 From: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 22:52:38 -0400 Subject: [PATCH 3/6] ci: refresh checks after concurrency-cancelled squash-attribution runs No content change. The three CANCELLED 'Sign-off survives the squash' entries on a9ad3666 are artifacts of dco-squash-attribution.yml's cancel-in-progress concurrency group: each hive stage/* label swap fires unlabeled+labeled 4s apart and the first run is cancelled by the second, which passed. Agents cannot re-run workflows, so a fresh head SHA is the smallest reversible way to get a clean check set. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> From 1fb300cc62715174f918d7be3073993fa1bd0476 Mon Sep 17 00:00:00 2001 From: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 23:08:21 -0400 Subject: [PATCH 4/6] ci: retrigger image build after transient registry-mirror blob miss Run 40995282597 failed resolving the pinned golang:1.27-alpine base image from mirror.gcr.io (content descriptor not found); the push run for the same commit succeeded. No source change. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> From a241a2ae64db2e50bccf0778c01f3fb6a00597c6 Mon Sep 17 00:00:00 2001 From: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Date: Fri, 30 Oct 2026 03:39:32 -0400 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=93=96=20docs:=20note=20that=20squash?= =?UTF-8?q?=20sign-off=20waivers=20are=20historical-only?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs #15659 Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --- CONTRIBUTING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fda1207856..8895a2b003 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -258,6 +258,15 @@ rewritten; their failures are resolved by maintainer disposition, not by you. blast radius — are documented in [`src/docs/v5-sync-policy.md`](src/docs/v5-sync-policy.md#inherited-dco-failures-from-v4). + **Note on waivers:** Per-SHA waivers in `DCO_WAIVED_COMMITS` are for commits + that landed before the "Sign-off survives the squash" pre-merge check + existed. That check (`.github/workflows/dco-squash-attribution.yml`, running + `src/scripts/check-squash-signoff-attribution.sh`) now prevents mismatched + sign-offs from reaching the protected branch; new mismatches are caught and + rejected at PR time. If your PR fails that check, fix your sign-off by + re-signing your branch commits (`git commit --amend -s`), not by seeking a + waiver. A waiver should never be needed for new squashes. + One identity shape the post-merge check resolves on its own: GitHub's squash writes the pull-request author's GitHub identity on the landing commit, so a contributor with a private email lands as From 34208c8a8bd14eef554f40c6f52ddde1b2b5feff Mon Sep 17 00:00:00 2001 From: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Date: Fri, 30 Oct 2026 06:07:04 -0400 Subject: [PATCH 6/6] docs: reword CONTRIBUTING waiver note to match checker behaviour Per-SHA waivers cover squashes the pre-merge check cannot resolve (noreply/sign-off pairs without same-person evidence yet), not only commits that predate the check. Drop the 'never needed for new squashes' claim, which the following paragraph and this PR's own waivers contradict. Hive-Fix-Attempt: 4/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --- CONTRIBUTING.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 336665d1d7..d1f8724c77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -258,14 +258,17 @@ rewritten; their failures are resolved by maintainer disposition, not by you. blast radius — are documented in [`src/docs/v5-sync-policy.md`](src/docs/v5-sync-policy.md#inherited-dco-failures-from-v4). - **Note on waivers:** Per-SHA waivers in `DCO_WAIVED_COMMITS` are for commits - that landed before the "Sign-off survives the squash" pre-merge check - existed. That check (`.github/workflows/dco-squash-attribution.yml`, running - `src/scripts/check-squash-signoff-attribution.sh`) now prevents mismatched - sign-offs from reaching the protected branch; new mismatches are caught and - rejected at PR time. If your PR fails that check, fix your sign-off by + **Note on waivers:** Per-SHA waivers in `DCO_WAIVED_COMMITS` cover squash + commits whose author/sign-off mismatch the checkers cannot resolve on their + own — typically a noreply author paired with a real sign-off address that + has no same-person evidence in the protected branch's history yet (see the + next paragraph). The "Sign-off survives the squash" pre-merge check + (`.github/workflows/dco-squash-attribution.yml`, running + `src/scripts/check-squash-signoff-attribution.sh`) catches every other kind + of mismatch at PR time. If your PR fails that check, fix your sign-off by re-signing your branch commits (`git commit --amend -s`), not by seeking a - waiver. A waiver should never be needed for new squashes. + waiver; waivers are a maintainer disposition for already-landed commits, not + a way around the pre-merge gate. One identity shape the post-merge check resolves on its own: GitHub's squash writes the pull-request author's GitHub identity on the landing commit, so a