From e8c6bc23e7032d54302dc3470f75d83a51d8164b Mon Sep 17 00:00:00 2001 From: David Fridrich Date: Tue, 4 Aug 2026 13:08:13 +0200 Subject: [PATCH] pass --squash to gh pr merge in dependabot auto-merge main had a merge queue until 2026-07-30 14:09 (last merge_group run). gh pr merge skips the merge-strategy requirement only when the base branch requires a merge queue (shouldAddToMergeQueue in pkg/cmd/pr/merge/merge.go); otherwise a non-interactive call without --merge/--rebase/--squash is a flag error. Once the queue was disabled the step started failing at 14:20, so auto-merge was never enabled and bump PRs piled up. The repo allows squash only. If a merge queue is ever re-enabled, gh just warns that the queue sets the strategy, so this is safe either way. --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 52ce1bc..d3e89e6 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -21,7 +21,7 @@ jobs: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' run: | - gh pr merge "$PR_URL" --auto + gh pr merge "$PR_URL" --auto --squash gh pr comment "$PR_URL" --body "✅ Auto-merge enabled. This PR will merge automatically / added to merge queue, once all checks pass." env: PR_URL: ${{ github.event.pull_request.html_url }}