ci: auto merge dependency updates

ridedott · Oct 15, 2019 · 66ad3f3 · 66ad3f3
1 parent 429f250
commit 66ad3f3
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v1
 
       - name: Setup Node.js with GitHub Package Registry
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@master
         with:
           node-version: 12
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -23,7 +23,7 @@ jobs:
           always-auth: true
 
       - name: Setup Node.js with npm Package Registry
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@master
         with:
           node-version: 12
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -40,7 +40,7 @@ jobs:
           CI: true
         run: npm ci
       - run: npm run spellcheck
-  types:
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -52,8 +52,8 @@ jobs:
       - env:
           CI: true
         run: npm ci
-      - run: npm run types
-  test:
+      - run: npm test
+  types:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -65,4 +65,18 @@ jobs:
       - env:
           CI: true
         run: npm ci
-      - run: npm test
+      - run: npm run types
+  auto-merge:
+    name: Auto merge Dependabot updates
+    runs-on: ubuntu-latest
+    needs:
+      - format
+      - lint
+      - spellcheck
+      - test
+      - types
+    steps:
+      - name: auto-merge
+        uses: ridedott/dependabot-auto-merge-action@master
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -0,0 +1,25 @@
+name: Auto merge Dependabot updates
+
+on:
+  check_suite:
+    types:
+      - completed
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: auto-merge
+        uses: ridedott/dependabot-auto-merge-action@master
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}