Skip to content

Commit

Permalink
Update automerge configuration to use Squash and Merge (#72)
Browse files Browse the repository at this point in the history
since this repo now only allows squash-and-merge, the automerging
funcitonality for dependabot PRs needs to be updated to squash and merge
- see also https://cli.github.com/manual/gh_pr_merge
  • Loading branch information
Eric Cornelissen authored Apr 21, 2022
1 parent 68b33e5 commit 85071cf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/auto_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Enable auto-merge for Dependabot PRs
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || 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}}

0 comments on commit 85071cf

Please sign in to comment.