Fix auto approve action

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Apr 20, 2021 · 526218d · 526218d
1 parent 0f8c402
commit 526218d
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml
@@ -1,11 +1,21 @@
-name: Dependabot auto approve
-on: pull_request
+name: Dependabot
+on: pull_request_target
 
 jobs:
-  build:
+  auto-merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: hmarr/auto-approve-action@v2.0.0
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+      # Default github action approve
+      - uses: hmarr/auto-approve-action@v2.1.0
+        if: github.ref == 'refs/heads/master' &&
+            (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
         with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Nextcloud bot approve and merge request
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        if: github.ref == 'refs/heads/master' &&
+            (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+        with:
+          target: minor
+          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}