Skip to content

Commit 4ae12f2

Browse files
abkrimclaude
andauthored
fix(ci): dependabot auto-merge uses squash, not merge commit (#5)
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) <noreply@anthropic.com>
1 parent 8e0b7f6 commit 4ae12f2

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/dependabot-auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020

2121
- name: Auto-merge Dependabot PRs for semver-minor updates
2222
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
23-
run: gh pr merge --auto --merge "$PR_URL"
23+
run: gh pr merge --auto --squash "$PR_URL"
2424
env:
2525
PR_URL: ${{github.event.pull_request.html_url}}
2626
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2727

2828
- name: Auto-merge Dependabot PRs for semver-patch updates
2929
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
30-
run: gh pr merge --auto --merge "$PR_URL"
30+
run: gh pr merge --auto --squash "$PR_URL"
3131
env:
3232
PR_URL: ${{github.event.pull_request.html_url}}
3333
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

0 commit comments

Comments
 (0)