From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 28 Sep 2020 15:44:38 +0000 (+0200)
Subject: ci: add auto merge [skip ci]
X-Git-Tag: v2.0.0-alpha.3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=253d007dccdd601bae9154bd012548bb2be4ea4e;p=thirdparty%2Fvuejs%2Fpinia.git

ci: add auto merge [skip ci]
---

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 }}