From 253d007dccdd601bae9154bd012548bb2be4ea4e Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 28 Sep 2020 17:44:38 +0200
Subject: [PATCH] ci: add auto merge [skip ci]

---
 .github/auto-merge.yml          |  6 ++++++
 .github/workflows/automerge.yml | 26 ++++++++------------------
 2 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 .github/auto-merge.yml

diff --git a/.github/auto-merge.yml b/.github/auto-merge.yml
new file mode 100644
index 00000000..b5ba2d04
--- /dev/null
+++ b/.github/auto-merge.yml
@@ -0,0 +1,6 @@
+- match:
+    dependency_type: development
+    update_type: all
+- match:
+    dependency_type: production
+    update_type: security:major
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index d1f16413..53875d2e 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -1,24 +1,14 @@
-on: pull_request
+name: auto-merge
 
-name: Auto merge Dependabot
+on:
+  pull_request:
 
 jobs:
-  automerge:
-    needs: [Test, Lint]
+  auto-merge:
     runs-on: ubuntu-latest
-    if: |
-      github.actor == 'dependabot[bot]' &&
-      github.event_name == 'pull_request' &&
-      startsWith(github.event.pull_request.title, 'chore(deps-dev):')
     steps:
-      - name: '@dependabot merge'
-        uses: actions/github-script@v2
+      - uses: actions/checkout@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            await github.issues.createComment({
-              owner: context.payload.repository.owner.login,
-              repo: context.payload.repository.name,
-              issue_number: context.payload.pull_request.number,
-              body: '@dependabot merge'
-            })
+          target: minor
+          github-token: ${{ secrets.GH_TOKEN }}
-- 
2.47.2