Merge branch 'main' into patch-5

emad1231 · Oct 8, 2020 · 24c7842 · 24c7842
2 parents 364a432 + d5112be
commit 24c7842
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
@@ -31,5 +31,6 @@ module.exports = [
   'repo-sync/github-sync@v2',
   'repo-sync/pull-request@v2',
   'rtCamp/action-slack-notify@master',
-  'rtCamp/[email protected]'
-]
+  'rtCamp/[email protected]',
+  'tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0'
+]
diff --git a/.github/workflows/automerge-dependencies.yml b/.github/workflows/automerge-dependencies.yml
@@ -0,0 +1,14 @@
+name: Auto Merge Dependency Updates
+
+on:
+  - pull_request
+  - pull_request_review
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allowed-actors: dependabot[bot]