From 2fac4b61b4b4a05fd28a324638be18623059c229 Mon Sep 17 00:00:00 2001 From: claude-ceo-assistant Date: Fri, 8 May 2026 13:08:51 +0000 Subject: [PATCH] chore(workflows): drop staging-branch triggers (Phase 3b of internal#81) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trunk-based migration: main is the only branch. Update 4 workflows that fired on staging-branch pushes to fire on main instead. - e2e-staging-canvas.yml: drop staging from push + pull_request - e2e-staging-external.yml: drop staging from push + pull_request - e2e-staging-saas.yml: drop staging from push + pull_request, update header comment that references the (now-obsolete) staging→main auto-promote flow - redeploy-tenants-on-staging.yml: workflow_run.branches changes from [staging] to [main] so the tenant redeploy fires when publish-workspace-server-image runs on main Workflows that target the staging tenant FLEET (canary-staging.yml, e2e-staging-sanity.yml) are not changed — they fire on cron, the word "staging" in their filenames refers to the deployment target environ- ment, not the git branch. Lands as Phase 3b after #108 promotes the 5 staging-only feature PRs (Phase 3a). Phase 3c deletes the obsolete promote/sync workflows (auto-promote-staging, auto-sync-main-to-staging, etc.) plus the staging branch itself, after we no-op-verify both Phase 3a and 3b green. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/e2e-staging-canvas.yml | 4 ++-- .github/workflows/e2e-staging-external.yml | 4 ++-- .github/workflows/e2e-staging-saas.yml | 13 ++++++------- .github/workflows/redeploy-tenants-on-staging.yml | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/e2e-staging-canvas.yml b/.github/workflows/e2e-staging-canvas.yml index 30a38e5f..67fe1d6d 100644 --- a/.github/workflows/e2e-staging-canvas.yml +++ b/.github/workflows/e2e-staging-canvas.yml @@ -22,9 +22,9 @@ on: # spending CI cycles. See e2e-api.yml for the rationale on why this # is a single job rather than two-jobs-sharing-name. push: - branches: [main, staging] + branches: [main] pull_request: - branches: [main, staging] + branches: [main] workflow_dispatch: schedule: # Weekly on Sunday 08:00 UTC — catches Chrome / Playwright / Next.js diff --git a/.github/workflows/e2e-staging-external.yml b/.github/workflows/e2e-staging-external.yml index acd9cef2..5b8d4a9c 100644 --- a/.github/workflows/e2e-staging-external.yml +++ b/.github/workflows/e2e-staging-external.yml @@ -32,7 +32,7 @@ name: E2E Staging External Runtime on: push: - branches: [staging, main] + branches: [main] paths: - 'workspace-server/internal/handlers/workspace.go' - 'workspace-server/internal/handlers/registry.go' @@ -44,7 +44,7 @@ on: - 'tests/e2e/test_staging_external_runtime.sh' - '.github/workflows/e2e-staging-external.yml' pull_request: - branches: [staging, main] + branches: [main] paths: - 'workspace-server/internal/handlers/workspace.go' - 'workspace-server/internal/handlers/registry.go' diff --git a/.github/workflows/e2e-staging-saas.yml b/.github/workflows/e2e-staging-saas.yml index bab88409..43e81aba 100644 --- a/.github/workflows/e2e-staging-saas.yml +++ b/.github/workflows/e2e-staging-saas.yml @@ -20,13 +20,12 @@ name: E2E Staging SaaS (full lifecycle) # via the same paths watcher that e2e-api.yml uses) on: - # Fire on staging push too — previously this only ran on main, which - # meant the most thorough end-to-end test caught regressions AFTER - # they shipped to staging (and then to the auto-promote PR). Running - # on staging push catches them BEFORE the staging→main promotion - # opens, so a green canary into auto-promote is more meaningful. + # Trunk-based (Phase 3 of internal#81): main is the only branch. + # Previously this fired on staging push too because staging was a + # superset of main and ran the gate ahead of auto-promote; with no + # staging branch, main is where E2E gates the deploy. push: - branches: [staging, main] + branches: [main] paths: - 'workspace-server/internal/handlers/registry.go' - 'workspace-server/internal/handlers/workspace_provision.go' @@ -36,7 +35,7 @@ on: - 'tests/e2e/test_staging_full_saas.sh' - '.github/workflows/e2e-staging-saas.yml' pull_request: - branches: [staging, main] + branches: [main] paths: - 'workspace-server/internal/handlers/registry.go' - 'workspace-server/internal/handlers/workspace_provision.go' diff --git a/.github/workflows/redeploy-tenants-on-staging.yml b/.github/workflows/redeploy-tenants-on-staging.yml index 2726db9e..695f6643 100644 --- a/.github/workflows/redeploy-tenants-on-staging.yml +++ b/.github/workflows/redeploy-tenants-on-staging.yml @@ -36,7 +36,7 @@ on: workflow_run: workflows: ['publish-workspace-server-image'] types: [completed] - branches: [staging] + branches: [main] workflow_dispatch: inputs: target_tag: -- 2.45.2