diff options
author | Léo Colombaro <git@colombaro.fr> | 2021-09-15 02:18:24 +0300 |
---|---|---|
committer | Léo Colombaro <git@colombaro.fr> | 2021-09-15 02:18:24 +0300 |
commit | cd498d9ff886a62f503d7c962068a7b09aef2e03 (patch) | |
tree | 1728ba64c7e9a9094922219532eba1a2592ced1f | |
parent | abe730c2322883ae3a0fa88ede3e856136789859 (diff) |
Enable auto-merge for dependabot
-rw-r--r-- | .github/workflows/auto-merge.yml (renamed from .github/workflows/dependabot.yml) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/auto-merge.yml index 083bff37..5dbbbc9e 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/auto-merge.yml @@ -1,6 +1,6 @@ # https://docs.github.com/actions -name: Dependabot +name: Auto-merge on: pull_request_target @@ -10,7 +10,7 @@ permissions: jobs: dependabot: - name: Auto-merge + name: Dependabot runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} steps: @@ -28,7 +28,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto "$PR_URL" + run: gh pr merge --auto --rebase "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |