@@ -156,29 +156,6 @@ jobs:
156156 fi
157157 done
158158
159- # All four packages share ONE .release-please-manifest.json (separate-pull-requests: true still
160- # means every component reads/writes that same file), so merging any one component's Release PR
161- # immediately makes every OTHER open Release PR's copy of that file stale, surfacing as a GitHub
162- # merge conflict -- confirmed live 2026-07-23: PR #8146 (engine-and-dependents) went CONFLICTING
163- # the moment PR #8145 (ui-kit) merged, purely from manifest-file drift, no real content collision.
164- # release-please self-heals this by regenerating/force-pushing its own branches on every run, but
165- # only once someone merges the SIBLING PR that caused the conflict -- the actual fix is shrinking
166- # the window multiple Release PRs can sit open at once. Auto-merging them the moment CI goes green
167- # does that: GitHub's own auto-merge only fires once every required check (including this repo's
168- # full CI suite) passes, so this adds no less scrutiny than a human clicking merge -- it just
169- # removes the wait for a human to notice. Scoped to the exact "autorelease: pending" label
170- # release-please's own action applies, so this can never touch a contributor or maintainer PR.
171- - name : Auto-merge this run's own Release PRs once CI is green
172- env :
173- GH_TOKEN : ${{ secrets.RELEASE_PLEASE_TOKEN }}
174- run : |
175- set -euo pipefail
176- numbers="$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --label "autorelease: pending" --json number --jq '.[].number')"
177- for number in $numbers; do
178- echo "Enabling auto-merge on release-please PR #$number."
179- gh pr merge "$number" --repo "$GITHUB_REPOSITORY" --auto --squash || echo "::warning::Could not enable auto-merge on #$number (already enabled, or not yet mergeable) -- continuing."
180- done
181-
182159 # release-please creates the component tag + GitHub Release with GITHUB_TOKEN, which (by
183160 # GitHub's recursion-prevention rule) does NOT fire push/tag-based workflows. workflow_dispatch
184161 # IS exempt from that rule, so dispatch the OIDC publish workflow explicitly, telling it
0 commit comments