Skip to content

docs(governance): record the branch-protection remediation applied to main - #26

Merged
zylvex-tech merged 2 commits into
mainfrom
docs/post-merge-audit-2026-10-22
Oct 25, 2026
Merged

zylvex-tech merged 2 commits into
mainfrom
docs/post-merge-audit-2026-10-22

Conversation

@zylvex-tech

Copy link
Copy Markdown
Owner

What this is

Section 5 of the post-merge audit found main unprotected and recommended a configuration. That recommendation has now been applied under explicit owner authorization, and this PR updates the report so it no longer reads as a live gap.

Applied 2026-10-22 14:19 UTC, verified by readback:

Setting Value
Require a pull request before merging on, 1 approval
Require status checks to pass on
Required checks check / test / frontend (ubuntu-22.04), check / test / frontend (windows-latest), check / test / frontend (macos-latest), coverage
Require branches to be up to date on (strict: true)
Require conversation resolution on
Do not allow bypassing the above on (enforce_admins: true)
Allow force pushes off
Allow deletions off
Required linear history off — this repo merges with merge commits

The macOS question was settled with data

The reviewer cautioned against making macOS a required gate before establishing suite stability — one green run does not establish reliability. Rather than assume either way, the macOS job conclusion was pulled for the last 16 CI runs:

Outcome Count Detail
success 12 —
failure 2 184e178 (the flaky egress guard, pre-PR #23) and 67f9910 (PR #14, rusqlite 0.31 → 0.40)
consecutive successes since PR #23 5 3bd5059, 7ea578d, 33b1ad3, 4e24e2a, 794fc46

The second failure is not flakiness — it is a deterministic compile error:

error[E0277]: the trait bound `u64: FromSql` is not satisfied
error: could not compile `zylcode-desktop` (bin "zylcode-desktop" test)

That fails identically on every run, which is exactly the class of defect a required check exists to catch. The only genuinely flaky failure in the entire history is the one PR #23 structurally eliminated — a thread-local egress counter makes cross-test interference impossible by construction rather than improbable.

One deliberate omission

Dependabot was left out of the required set. It is reported on 4e24e2a but not on 3bd5059. Requiring a check that does not run on every commit would block merges waiting for a status that never arrives.

Residual risk, stated plainly

Five consecutive green runs is good evidence, not a formal stability baseline. If macOS flakes again, the correct response is to fix the test — not to remove it from the required set, because a required check that can be quietly dropped is no protection at all. The ~10-run baseline remains a P2 item.

Owner follow-up

If ci.yml or coverage.yml job names ever change, the required-check list must be updated to match. A renamed job silently stops satisfying a required check and would block merges.

Note

This PR is itself the first to run under the new protection, so it doubles as a live check that the configuration is workable.

… main

Section 5 of the audit found main unprotected and recommended a
configuration. That recommendation has now been applied under explicit owner
authorization, and the report is updated so it does not read as a live gap.

Applied 2026-10-22 14:19 UTC, verified by readback: PR required with 1
approval; four required status checks (ubuntu-22.04, windows-latest,
macos-latest, coverage); strict up-to-date branches; conversation resolution
required; enforce_admins on; force pushes and deletions off; linear history
off, because this repo merges with merge commits.

The reviewer cautioned against making macOS required before establishing
suite stability. That was settled with data rather than assumption: the macOS
job conclusion was pulled for the last 16 CI runs. 12 successes, 2 failures.
One failure is 184e178, the flaky egress guard that predates PR #23. The other
is 67f9910 (PR #14, rusqlite 0.31 to 0.40), which is a deterministic compile
error -- error[E0277]: the trait bound u64: FromSql is not satisfied -- not
flakiness at all, and exactly what a required check should catch. Since PR #23
landed there have been five consecutive macOS successes.

Dependabot was deliberately left out of the required set: it is reported on
4e24e2a but not on 3bd5059, so requiring it would block merges waiting for a
status that never arrives.

The residual risk is stated plainly in the new section rather than smoothed
over: five green runs is good evidence, not a formal stability baseline. The
executive summary row and the P0 item are updated to point at 5.2 so a reader
does not stop at "No" and conclude main is still unguarded.
@zylvex-tech
zylvex-tech merged commit 7ae694b into main Oct 25, 2026
4 checks passed
@zylvex-tech
zylvex-tech deleted the docs/post-merge-audit-2026-10-22 branch October 25, 2026 10:42
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.

2 participants