From 07b8ebf14ea2bdd961c28518294c928a42515ec3 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 30 Jun 2021 23:49:17 +0000 Subject: [PATCH] File sync from s4u/.github - enable auto merge --- .github/workflows/auto-approve.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 876f611f..e834cbb2 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -7,10 +7,19 @@ jobs: auto-approve: runs-on: ubuntu-latest steps: + + - uses: alexwilson/enable-github-automerge-action@1.0.0 + if: > + github.actor == 'dependabot[bot]' + || github.actor == 'dependabot-preview[bot]' + with: + merge-method: "REBASE" + github-token: "${{ secrets.TECH_TOKEN }}" + - uses: hmarr/auto-approve-action@v2.1.0 if: > github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'slawekjaranowski' with: - github-token: "${{ secrets.GITHUB_TOKEN }}" + github-token: "${{ secrets.TECH_TOKEN }}"