Skip to content

chore(release): reconcile main ancestry for protected promotion - #3817

Merged
twoimo merged 4 commits into
developfrom
fix/release-lineage-20261113
Nov 12, 2026
Merged

twoimo merged 4 commits into
developfrom
fix/release-lineage-20261113

Conversation

@twoimo

@twoimo twoimo commented Nov 12, 2026

Copy link
Copy Markdown
Owner

Why

Draft data → main PR #3816 is conflict-free but remains behind under strict protection because data does not yet contain main's two historical merge commits. Weakening strict protection would hide the ancestry problem.

Change

  • Reconcile the exact protected refs in one candidate: develop 31f3fd7e92b48079850b2482549bf6c35d14083a, data 8af98ee68890925dddc4f145911774b3e70fa0cf, and main 36a6a3b507dbdbef9afd11dafe73c0efc4e29c80.
  • Preserve all three as actual commit parents. This PR must use a merge commit so the next normal develop → data promotion carries main's ancestry.
  • Update only docs/operations/cicd-simplification.md with the completed documentation-only CI observation, successful chore(release): promote reviewed develop to data #3815 data promotion, and chore(release): prepare reviewed data promotion to main #3816 draft production boundary.
  • Retain strict branch protection and the existing serialized develop → data → main release path.

Verification

  • The ancestry merge completed without conflicts; before the documentation update its complete tree was exactly f6853410d1b49deca57de9310281dfa470ba5bf3, matching current develop and data.
  • Final candidate tree: b1401742902c6a931528f8e0277162d034cf51c1. The remote commit's tree and ordered parents match the locally verified candidate.
  • Only one documentation file changes (23 additions, 7 deletions). Runtime, tests, and configuration retain identical bytes. Relative links and git diff --check pass.
  • docs(ci): record rollout and reconcile protected promotion ancestry #3814 documentation-only CI passed at exact head 592e713c6968e07c254aaf30a12787e173d02609: 32 seconds wall time, two successful and eight skipped job records. The skipped unit matrix is one unexpanded record.
  • chore(release): promote reviewed develop to data #3815 completed all seven applicable promotion workflows before normal merge. Hosted checks for this exact candidate will be verified before merging this PR.

Release boundary

This PR repairs source ancestry. Production deployment, main-only activation, and Mac cleanup remain pending. Draft #3816 will receive a fresh head through the protected promotion sequence; current production and rollback identity must be verified in Vercel before production-affecting actions.

release: promote repository, CI and local database updates to main
release: deploy Vercel build optimizations to production
chore(release): promote reviewed develop to data
@twoimo
twoimo merged commit 4c0b8f8 into develop Nov 12, 2026
29 checks passed
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