Skip to content

Commit c385733

Browse files
committed
fix(ci): track-bst-sources: use --squash for auto-merge, not --merge
The repo has allowMergeCommit=false — only squash merges are permitted. The previous --merge call silently fell through to the warning echo, leaving auto-merge never set on tracking PRs. Switch to --squash. Assisted-by: Claude Sonnet 4.6 via pi
1 parent 65dc846 commit c385733

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/track-bst-sources.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ jobs:
263263
264264
if [ "${{ matrix.group }}" = "auto-merge" ]; then
265265
echo "Enabling auto-merge..."
266-
# Use --merge to match the merge queue's required merge_method=MERGE.
267-
# --squash conflicts with the merge queue ruleset and prevents auto-queuing.
268-
gh pr merge "$PR_URL" --auto --merge || echo "::warning::Could not enable auto-merge"
266+
# Use --squash: the repo only allows squash merges (allowMergeCommit=false).
267+
# --merge would silently fail via the '|| echo ::warning::' fallback.
268+
gh pr merge "$PR_URL" --auto --squash || echo "::warning::Could not enable auto-merge"
269269
fi
270270
271271
track-tarballs:

0 commit comments

Comments
 (0)