Skip to content

Commit

Permalink
maint: use squash merge for dependabot auto-merge (#122)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?

- previous attempts to auto-merge dev dependencies
[failed](https://github.com/honeycombio/honeycomb-opentelemetry-python/actions/runs/4585202481/jobs/8097205347?pr=118)
merge

## Short description of the changes

- update `--merge` flag to `--squash`
[flag](https://cli.github.com/manual/gh_pr_merge)

## How to verify that this has the expected result

next dependabot should successfully auto-merge a passing dev patch
update
  • Loading branch information
JamieDanielson committed Apr 3, 2023
1 parent e370c66 commit f8e92fd
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 @@ -17,7 +17,7 @@ jobs:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs for Dev Dependency Patch Updates
if: ${{contains(steps.metadata.outputs.dependency-type, 'direct:development') && steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --merge "$PR_URL"
run: gh pr review --approve "$PR_URL" && 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 f8e92fd

Please sign in to comment.