mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 02:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

github: pass --rebase to gh pr merge since it requires it

Browse source 
It seems that there's no way to just enable auto-merge without
specifying a merge strategy (presumably because some projects allow
several GitHub merge strategies), so I guess we'll have to live with
the strategy being duplicated between here and the project settings.
This commit is contained in:
Martin von Zweigbergk 2022-09-06 10:59:23 -07:00 committed by Martin von Zweigbergk
parent 47e7307dcc
commit a33417fa35
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/dependabot.yml vendored
View file

@ -12,7 +12,7 @@ jobs:
if: ${{ github.actor == 'dependabot[bot]' }} if: ${{ github.actor == 'dependabot[bot]' }}
steps: steps:
- name: Enable auto-merge for Dependabot PRs - name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto "$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}}