From 9547bc43581e9bd2d730739451a0031887c06a6b Mon Sep 17 00:00:00 2001 From: Abdelkarim Mateos Sanchez Date: Wed, 22 Apr 2026 11:42:55 +0200 Subject: [PATCH] fix(ci): dependabot auto-merge uses squash, not merge commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The repo only allows squash merges on protected main, so the auto-merge workflow was failing with: Merge method merge commits are not allowed on this repository Switch --merge → --squash in both semver-minor and semver-patch auto-merge steps. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/dependabot-auto-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index cc8c94c..9e0fce5 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -20,14 +20,14 @@ jobs: - name: Auto-merge Dependabot PRs for semver-minor updates if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}} - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Auto-merge Dependabot PRs for semver-patch updates if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}} - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}