From d47e6af097133f3b1abcaa04f3d05f0a15dc7043 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 28 Jan 2022 23:41:27 +0000 Subject: [PATCH] Updating dependabot-approve-merge.yml workflow from template Signed-off-by: Nextcloud bot --- .github/workflows/dependabot-approve-merge.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index b56a1da4..19a1311b 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -7,23 +7,23 @@ name: Dependabot on: pull_request_target: - branches: + branches: - master - stable* jobs: - auto-merge: + auto-approve-merge: + if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest + steps: - # Default github action approve - - uses: hmarr/auto-approve-action@v2.0.0 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + # Github actions bot approve + - uses: hmarr/auto-approve-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} # Nextcloud bot approve and merge request - - uses: ahmadnassri/action-dependabot-auto-merge@v1 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + - uses: ahmadnassri/action-dependabot-auto-merge@v2 with: target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}