From 1e03b169ac06fe06709250833d6729cde841a697 Mon Sep 17 00:00:00 2001 From: Cato <41178744+catomean@users.noreply.github.com> Date: Sat, 5 Sep 2026 18:29:36 +0200 Subject: [PATCH] =?UTF-8?q?ci:=20auto-merge=20sweep=20reconciles=20deploym?= =?UTF-8?q?ent=20=E2=80=94=20sweep=20merges=20were=20stranding=20commits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A sweep merge is a GITHUB_TOKEN push, which fires no push workflows: main went green and nothing deployed (proven today — the consumer-swap merges needed hand-dispatched deploys). deploy_workflow tells the canonical sweep to compare main tip vs the last successful deploy run and dispatch deploy.yml when they differ, same as solon/orangecat already do. Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01WqKqMnHQHSmkGFfc5t7Rxn --- .github/workflows/auto-merge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 411b016..a7b7237 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -37,3 +37,6 @@ jobs: ci_workflow: ci.yml # SPACE-separated: the sweep word-splits this. rearm_workflows: 'ci.yml publish.yml' + # Reconcile deployment: a sweep merge is a GITHUB_TOKEN push, which fires + # no workflows — without this, main goes green and NOTHING deploys. + deploy_workflow: deploy.yml