diff --git a/.github/pr-stack.json b/.github/pr-stack.json index 6742eb5e118..76e6344326d 100644 --- a/.github/pr-stack.json +++ b/.github/pr-stack.json @@ -21,24 +21,7 @@ "branch": "fork/changes" } ], - "integrationOverlays": [ - { - "number": 254, - "branch": "t3-discord/f7d37879-desktop-deeplinks" - }, - { - "number": 174, - "branch": "fork/discord" - }, - { - "number": 175, - "branch": "fork/vscode" - }, - { - "number": 250, - "branch": "fork/identity" - } - ], + "integrationOverlays": [], "conflictResolutions": [ { "branch": "fork/integration", diff --git a/.github/workflows/fork-ci.yml b/.github/workflows/fork-ci.yml index c27c9214aed..cd7abf132da 100644 --- a/.github/workflows/fork-ci.yml +++ b/.github/workflows/fork-ci.yml @@ -29,7 +29,8 @@ on: # Upstream Blacksmith CI must stay disabled_manually. fork/base supplies # GitHub-hosted runners + fork-ci.yml for all layers above it. # - # Keep overlay bases in sync with integrationOverlays in pr-stack.json. + # integrationOverlays is empty: the overlays were drained into fork/dev at + # cutover. Re-add bases here if one is ever registered again. pull_request: branches: - fork/base @@ -38,11 +39,6 @@ on: - fork/changes # Stable contributor and release branch (docs/stable-dev-release-branch-handover.md). - fork/dev - # Registered integration overlays (same names as .github/pr-stack.json) - - t3-discord/f7d37879-desktop-deeplinks - - fork/discord - - fork/vscode - - fork/identity # fork/dev is never rebased, so its merge commits are the release candidates. # Deployment promotes an exact green SHA and keys on a successful run of this # workflow for that SHA, so every merge must produce one — a green PR tip is