From dd2ea4a9ca39bda214115302ed1f43ec58e11c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Colombaro?= Date: Wed, 15 Sep 2021 01:31:21 +0200 Subject: [PATCH] Enable auto-merge for dependabot --- .github/workflows/{dependabot.yml => auto-merge.yml} | 8 ++++---- .github/workflows/lint.yml | 2 +- .github/workflows/server.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{dependabot.yml => auto-merge.yml} (87%) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/auto-merge.yml similarity index 87% rename from .github/workflows/dependabot.yml rename to .github/workflows/auto-merge.yml index e2854d9..5dbbbc9 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/auto-merge.yml @@ -1,6 +1,6 @@ -# https://help.github.com/actions +# 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 }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 14428f1..61cdc7c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -# https://help.github.com/actions +# https://docs.github.com/actions name: Lint diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 64c41f9..16836b6 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -1,4 +1,4 @@ -# https://help.github.com/actions +# https://docs.github.com/actions name: Server CI