Merge pull request #7 from camptocamp/dependabot-merge

Support GitHub dependabot
sbrunner · Dec 2, 2020 · b8bfda4 · b8bfda4
2 parents 4a6e904 + 41d8ced
commit b8bfda4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml
@@ -25,3 +25,4 @@ jobs:
         uses: ridedott/dependabot-auto-merge-action@master
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_LOGIN: dependabot[bot]
diff --git a/example-project/.github/workflows/dependabot-auto-merge.yaml b/example-project/.github/workflows/dependabot-auto-merge.yaml
@@ -21,7 +21,14 @@ jobs:
     timeout-minutes: 5
 
     steps:
+      # Legacy dependabot
       - name: Auto merge
         uses: ridedott/dependabot-auto-merge-action@master
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # GitHub dependabot
+      - name: Auto merge
+        uses: ridedott/dependabot-auto-merge-action@master
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_LOGIN: dependabot[bot]