release: promote Dev_new_gui to main — 81 commits behind, blocked by one divergent commit #13389

Activity

1. mrveiss commented on Aug 3, 2026

   

   mrveiss

   on Aug 3, 2026

   OwnerAuthor

   More actions

   Step 1 and 2 are up:

   • chore(release): merge main back into Dev_new_gui to clear promotion divergence (#13389) #13390 — merges origin/main into Dev_new_gui to clear the divergence. Verified zero content delta against both parents (git diff --stat empty in each direction); git rev-list --count HEAD..origin/main is now 0, which is the condition sync-main-to-dev.yml gates on.
   • ci(marker-tests): withhold the nightly cron until the suite is green (#13286) #13391 — comments out the marker-tests.yml cron so promotion does not register a nightly whose only run was red (Marker-excluded tests (slow/integration/performance/distributed) run in no workflow at all #13286). workflow_dispatch stays live. Owner chose this over promoting red or blocking on a Marker-excluded tests (slow/integration/performance/distributed) run in no workflow at all #13286 fix.

   Both target Dev_new_gui and must land before Sync Dev_new_gui → main is dispatched with confirm release.

   Remaining after that: verify main == Dev_new_gui, and confirm the three intended schedules (ci-dispatch-watchdog, coverage, test-durations) register and fire — plus that self-hosted-runner-health on main stops running the broken pre-#13045 copy.
2. github-actions

   added

   backend

   frontend

   testing

   on Aug 3, 2026
3. mrveiss

   added a commit that references this issue on Aug 3, 2026

   chore: claim worktree (#13389) (#13390)

   ...

   7f04c92
4. mrveiss commented on Aug 3, 2026

   

   mrveiss

   on Aug 3, 2026

   OwnerAuthor

   More actions

   Steps 1 and 2 are done.

   • chore(release): merge main back into Dev_new_gui to clear promotion divergence (#13389) #13390 merged — origin/main merged back into Dev_new_gui, clearing the one divergent commit (b56497fa9) that made sync-main-to-dev.yml abort. Zero content delta, verified in both directions before merge.
   • ci(marker-tests): withhold the nightly cron until the suite is green (#13286) #13391 merged — marker-tests.yml's nightly cron is commented out, so promotion will not register a schedule whose only run was red (Marker-excluded tests (slow/integration/performance/distributed) run in no workflow at all #13286). workflow_dispatch stays live; uncommenting the cron is the closing step of Marker-excluded tests (slow/integration/performance/distributed) run in no workflow at all #13286.

   Remaining: run Sync Dev_new_gui → main with confirm release, then verify main == Dev_new_gui and that the three intended schedules (ci-dispatch-watchdog, coverage, test-durations) register — plus that self-hosted-runner-health on main stops running the broken pre-#13045 copy.

   That dispatch is an owner action (it force-advances the default branch of a public repo), so I have not run it.
5. mrveiss commented on Aug 4, 2026

   

   mrveiss

   on Aug 4, 2026

   OwnerAuthor

   More actions

   Ready to dispatch — owner action.

   Both prerequisites are merged:

   • chore(release): merge main back into Dev_new_gui to clear promotion divergence (#13389) #13390 cleared the divergence (origin/main merged back into Dev_new_gui, zero content delta verified in both directions), so sync-main-to-dev.yml's behind != 0 abort no longer fires.
   • ci(marker-tests): withhold the nightly cron until the suite is green (#13286) #13391 commented out marker-tests.yml's nightly cron, so promotion will not register a schedule whose only run was red (Marker-excluded tests (slow/integration/performance/distributed) run in no workflow at all #13286). workflow_dispatch stays live; uncommenting it is the closing step of that issue.

   To run it: workflow_dispatch on "Sync Dev_new_gui → main" with confirm release. It fast-forwards without --force and aborts if main holds anything Dev_new_gui lacks.

   Confirmed as an owner action rather than something I trigger — it force-advances the default branch of a public repository and registers four previously dormant scheduled workflows (ci-dispatch-watchdog, coverage, test-durations, plus replacing the broken pre-#13045 self-hosted-runner-health copy that main runs every 30 minutes).

   After dispatch, worth verifying: main == Dev_new_gui, and that the three intended schedules register and fire.
6. mrveiss commented on Aug 10, 2026

   

   mrveiss

   on Aug 10, 2026

   OwnerAuthor

   More actions

   Promoted — main synced. PR #13972 merged.

   before: main 5bae2b974, 47 commits behind Dev_new_gui
   after : main cb526c5dd, 1 commit behind (that one landed after the snapshot)
   

   Steps

   • PR merging origin/main into Dev_new_gui to clear the divergence — chore(release): merge main back into Dev_new_gui so the sync workflow can fast-forward #13951, zero content change
   • Decide marker-tests.yml — the decision turned out to be moot, see below
   • Run Sync Dev_new_gui → main — dispatched twice; it cannot complete, see below
   • Verify main == Dev_new_gui — one commit apart, and that commit merged after the release branch was cut

   The marker-tests.yml decision is moot

   This issue asks to choose between promoting it red or holding it back. Neither is needed — all four workflows are already on main, having landed with the #13816 sync on 2026-08-09:

   ci-dispatch-watchdog: on_trunk=yes on_main=yes
   coverage:             on_trunk=yes on_main=yes
   test-durations:       on_trunk=yes on_main=yes
   marker-tests:         on_trunk=yes on_main=yes
   

   marker-tests.yml is byte-identical on both branches, so this promotion changes nothing about it. Its failures are also all pull_request/push events, not schedule — so the "recurring red scheduled run" this issue anticipated has not started. #13286 remains the live question, independently.

   The workflow still cannot complete — two more blockers found

   Dispatching it after clearing the divergence surfaced two further layers, neither known when this issue was filed:

   1. GH006: Protected branch update failed for refs/heads/main … (protected branch hook declined) — main requires two status checks, so a direct push moves it to a commit carrying neither. The fast-forward push could never have worked, divergence or not. Fixed in fix(ci): open a release PR instead of pushing to protected main #13968: the workflow now opens a release PR so those checks run against the release head.
   2. GraphQL: GitHub Actions is not permitted to create or approve pull requests — a repository setting. The workflow pushed release-sync-main and then could not open the PR. fix(ci): do not fail the release sync when Actions may not open PRs #13973 makes that degrade to a warning with a compare link rather than reading as a failed sync; I opened release: sync Dev_new_gui into main (47 commits) #13972 by hand.

   So this promotion was completed manually at the last step. The builtin gets one step further than before but still needs a human click until that setting changes — which is a permissions decision, not a defect.

   It re-arms its own blocker every cycle

   Merging the release PR created a merge commit on main that is not in Dev_new_gui:

   $ git rev-list --count origin/Dev_new_gui..origin/main
   1
   

   That is the same shape as b56497fa9, the commit this issue was filed about. Every promotion through a PR leaves main one merge commit ahead, which trips the divergence guard on the next run. Filed separately — closing this one as the promotion it asked for is done.
7. mrveiss

   closed this as completedon Aug 10, 2026