Use rebase for auto merge workflow

This commit is contained in:
William Brawner 2024-03-09 09:22:12 -07:00
parent d3fb723611
commit e05fa9b96b
Signed by: wbrawner
GPG key ID: 8FF12381C6C90D35

View file

@ -36,7 +36,7 @@ jobs:
if: ${{ github.actor == 'wbrawner' || github.actor == 'dependabot[bot]' }} if: ${{ github.actor == 'wbrawner' || github.actor == 'dependabot[bot]' }}
steps: steps:
- name: Enable auto-merge - name: Enable auto-merge
run: gh pr merge --auto --merge "$PR_URL" run: gh pr merge --auto --rebase "$PR_URL"
env: env:
PR_URL: ${{github.event.pull_request.html_url}} PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}