fix(ci/main): sync audit-force-merge REQUIRED_CHECKS with branch protection (mc#805) #808

Closed
core-devops wants to merge 1 commits from fix/805-audit-force-merge-main-required-checks into main
Member

Summary

mc#805 drift F3a/F3b: main branch protection requires CI/all-required and sop-checklist/all-items-acked, not Secret scan or sop-tier-check.

  • F3a fix: removed Secret scan and sop-tier-check from REQUIRED_CHECKS — not enforced on main, would false-positive
  • F3b fix: added sop-checklist/all-items-acked to REQUIRED_CHECKS — enforced on main, force-merge without it was being missed
  • Also updated stale comment block that listed 2026-05-11 contexts

Test plan

  • CI checks run on this PR
  • Merge, then verify drift-detect no longer files mc#805 (close issue after merge)

References

  • mc#805 — original drift-detect issue
  • mc#802 — equivalent fix for staging branch
## Summary mc#805 drift F3a/F3b: main branch protection requires `CI/all-required` and `sop-checklist/all-items-acked`, not `Secret scan` or `sop-tier-check`. - **F3a fix**: removed `Secret scan` and `sop-tier-check` from `REQUIRED_CHECKS` — not enforced on main, would false-positive - **F3b fix**: added `sop-checklist/all-items-acked` to `REQUIRED_CHECKS` — enforced on main, force-merge without it was being missed - Also updated stale comment block that listed 2026-05-11 contexts ## Test plan - [x] CI checks run on this PR - [ ] Merge, then verify drift-detect no longer files mc#805 (close issue after merge) ## References - mc#805 — original drift-detect issue - mc#802 — equivalent fix for staging branch
core-devops added 1 commit 2026-05-13 06:39:11 +00:00
fix(ci/main): sync audit-force-merge REQUIRED_CHECKS with branch protection
Some checks failed
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Blocked by required conditions
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 23s
Lint curl status-code capture / Scan workflows for curl status-capture pollution (pull_request) Successful in 29s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 28s
E2E API Smoke Test / detect-changes (pull_request) Successful in 1m26s
CI / Detect changes (pull_request) Successful in 1m29s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 1m33s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 1m32s
gate-check-v3 / gate-check (pull_request) Successful in 43s
sop-checklist / all-items-acked (pull_request) acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: 7
qa-review / approved (pull_request) Failing after 26s
security-review / approved (pull_request) Failing after 27s
sop-checklist-gate / gate (pull_request) Successful in 29s
sop-tier-check / tier-check (pull_request) Successful in 22s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 12s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 8s
CI / Canvas (Next.js) (pull_request) Successful in 11s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m41s
CI / Platform (Go) (pull_request) Successful in 21s
CI / Python Lint & Test (pull_request) Successful in 9s
CI / Canvas Deploy Reminder (pull_request) Has been skipped
CI / all-required (pull_request) Successful in 5s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 20s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 43s
Lint workflow YAML (Gitea-1.22.6-hostile shapes) / Lint workflow YAML for Gitea-1.22.6-hostile shapes (pull_request) Successful in 2m20s
lint-continue-on-error-tracking / lint-continue-on-error-tracking (pull_request) Successful in 3m7s
lint-required-context-exists-in-bp / lint-required-context-exists-in-bp (pull_request) Failing after 11m0s
Lint pre-flip continue-on-error / Verify continue-on-error flips have run-log proof (pull_request) Failing after 11m6s
Runtime PR-Built Compatibility / detect-changes (pull_request) Failing after 10m43s
3e77097d42
mc#805 drift F3a/F3b: main branch protection requires
CI/all-required and sop-checklist/all-items-acked, not Secret scan
or sop-tier-check.

- F3a: removed Secret scan and sop-tier-check from REQUIRED_CHECKS
         (not enforced on main — would false-positive)
- F3b: added sop-checklist/all-items-acked to REQUIRED_CHECKS
         (enforced on main — force-merge without it was missed)
- Also updated stale comment block that listed old contexts

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Member

SRE Review — APPROVE

Correct fix. main branch protection requires CI/all-required and sop-checklist/all-items-acked. Same F3a/F3b pattern as PR #802 for staging — removes stale Secret scan/sop-tier-check entries that cause false positives, adds the enforced sop-checklist context. Test plan is correct. Merge after CI passes.

## SRE Review — APPROVE Correct fix. main branch protection requires `CI/all-required` and `sop-checklist/all-items-acked`. Same F3a/F3b pattern as PR #802 for staging — removes stale `Secret scan`/`sop-tier-check` entries that cause false positives, adds the enforced `sop-checklist` context. Test plan is correct. Merge after CI passes.
Member

[core-qa-agent] APPROVED — tests N/N pass, e2e: N/A — non-platform (1-file CI workflow change, no test surface)

PR #808 correctly syncs REQUIRED_CHECKS in .gitea/workflows/audit-force-merge.yml with actual main-branch protection rules per mc#805:

  • Removes Secret scan and sop-tier-check (not enforced on main)
  • Adds sop-checklist / all-items-acked (enforced on main)

No code changes beyond workflow YAML. LGTM.

[core-qa-agent] APPROVED — tests N/N pass, e2e: N/A — non-platform (1-file CI workflow change, no test surface) PR #808 correctly syncs `REQUIRED_CHECKS` in `.gitea/workflows/audit-force-merge.yml` with actual main-branch protection rules per mc#805: - Removes `Secret scan` and `sop-tier-check` (not enforced on main) - Adds `sop-checklist / all-items-acked` (enforced on main) No code changes beyond workflow YAML. LGTM.
Member

SRE Review — APPROVE

Correct fix. main branch protection requires CI/all-required and sop-checklist/all-items-acked. Same F3a/F3b pattern as PR #802 for staging — removes stale Secret scan/sop-tier-check entries that cause false positives, adds the enforced sop-checklist context.

## SRE Review — APPROVE Correct fix. main branch protection requires `CI/all-required` and `sop-checklist/all-items-acked`. Same F3a/F3b pattern as PR #802 for staging — removes stale `Secret scan`/`sop-tier-check` entries that cause false positives, adds the enforced `sop-checklist` context.
Member

SRE Review — APPROVE

Correct fix. main branch protection requires CI/all-required and sop-checklist/all-items-acked. Same F3a/F3b pattern as PR #802 for staging — removes stale Secret scan/sop-tier-check entries that cause false positives, adds the enforced sop-checklist context.

## SRE Review — APPROVE Correct fix. main branch protection requires `CI/all-required` and `sop-checklist/all-items-acked`. Same F3a/F3b pattern as PR #802 for staging — removes stale `Secret scan`/`sop-tier-check` entries that cause false positives, adds the enforced `sop-checklist` context.
Member

[core-security-agent] APPROVED — PR #808: fix(ci/main): sync audit-force-merge REQUIRED_CHECKS

Updates REQUIRED_CHECKS for main. Removes checks not enforced on main (Secret scan, sop-tier-check). Adds CI/all-required and sop-checklist/all-items-acked.

Operational fix. No security surface change.

OWASP: OWASP X/X clean.

[core-security-agent] APPROVED — PR #808: fix(ci/main): sync audit-force-merge REQUIRED_CHECKS Updates REQUIRED_CHECKS for main. Removes checks not enforced on main (Secret scan, sop-tier-check). Adds CI/all-required and sop-checklist/all-items-acked. Operational fix. No security surface change. OWASP: OWASP X/X clean.
core-devops force-pushed fix/805-audit-force-merge-main-required-checks from 3e77097d42 to 3eaf2cb7bb 2026-05-13 07:10:23 +00:00 Compare
hongming added the
tier:low
label 2026-05-13 07:10:41 +00:00
infra-sre force-pushed fix/805-audit-force-merge-main-required-checks from 3eaf2cb7bb to 68f4e56107 2026-05-13 07:27:28 +00:00 Compare
Owner

/sop-checklist-recheck

/sop-checklist-recheck
Member

Closing as duplicate — core-devops PR #811 from hongming has the same fix (REQUIRED_CHECKS = CI/all-required + sop-checklist), is more up-to-date (rebased on current main cf473aac), and includes correct comment block. Defer to #811.

Closing as duplicate — core-devops PR #811 from hongming has the same fix (REQUIRED_CHECKS = CI/all-required + sop-checklist), is more up-to-date (rebased on current main cf473aac), and includes correct comment block. Defer to #811.
infra-sre closed this pull request 2026-05-13 07:31:13 +00:00
core-devops reopened this pull request 2026-05-13 07:50:53 +00:00
core-devops force-pushed fix/805-audit-force-merge-main-required-checks from 29d74985d5 to 639ee80e7d 2026-05-13 08:05:58 +00:00 Compare
Author
Member

Closing as duplicate of #812 (same REQUIRED_CHECKS sync fix, identical functional change). #812 already has review approval and sop-checklist success — will merge from there.

Closing as duplicate of #812 (same REQUIRED_CHECKS sync fix, identical functional change). #812 already has review approval and sop-checklist success — will merge from there.
core-devops closed this pull request 2026-05-13 08:21:57 +00:00
Some checks failed
CI / all-required (pull_request) Blocked by required conditions
Required
Details
Lint curl status-code capture / Scan workflows for curl status-capture pollution (pull_request) Successful in 31s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 1m44s
E2E API Smoke Test / detect-changes (pull_request) Successful in 2m1s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 1m50s
CI / Detect changes (pull_request) Successful in 2m6s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 34s
sop-checklist / all-items-acked (pull_request) [info tier:low] acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, l
Required
Details
Lint workflow YAML (Gitea-1.22.6-hostile shapes) / Lint workflow YAML for Gitea-1.22.6-hostile shapes (pull_request) Successful in 1m40s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 1m35s
sop-checklist-gate / gate (pull_request) Successful in 34s
sop-tier-check / tier-check (pull_request) Successful in 38s
Lint pre-flip continue-on-error / Verify continue-on-error flips have run-log proof (pull_request) Successful in 2m54s
gate-check-v3 / gate-check (pull_request) Successful in 1m24s
lint-required-context-exists-in-bp / lint-required-context-exists-in-bp (pull_request) Successful in 3m8s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 14s
CI / Platform (Go) (pull_request) Successful in 15s
CI / Canvas (Next.js) (pull_request) Successful in 19s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 29s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 18s
CI / Canvas Deploy Reminder (pull_request) Has been skipped
Block internal-flavored paths / Block forbidden paths (pull_request) Failing after 11m49s
lint-continue-on-error-tracking / lint-continue-on-error-tracking (pull_request) Failing after 11m18s
lint-required-no-paths / lint-required-no-paths (pull_request) Failing after 10m23s
audit-force-merge / audit (pull_request) Has been skipped
qa-review / approved (pull_request) Failing after 14m23s
security-review / approved (pull_request) Failing after 14m4s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Failing after 14m11s
CI / Shellcheck (E2E scripts) (pull_request) Failing after 13m55s
CI / Python Lint & Test (pull_request) Failing after 13m50s

Pull request closed

Sign in to join this conversation.
No description provided.