Merge pull request #318 from nextcloud/feat/workflow-auto-update-depe…

…ndabot-approve-merge.yml
nextcloud · Apr 12, 2022 · f9f574d · f9f574d
2 parents fb4598e + d47e6af
commit f9f574d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git 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 }}