From d76999c76308cec65b09d4cdb44d829d19cb60e5 Mon Sep 17 00:00:00 2001
From: Rico Huijbers <rix0rrr@gmail.com>
Date: Fri, 13 Sep 2019 02:00:10 +0200
Subject: [PATCH] chore(mergify): automerge dependabot, allow provisional
 approval (#4043)

Two changes to the Mergify config (hoping that I've done it correctly):

- Automatically merge commits from dependabot. Having to go through
  approve/rebase/approve cycles is tiresome.
- Don't dimiss stale approvals if the PR author is someone from the core
  team. This allows doing provisional approvals ("it's okay but change
  this one thing before you merge").
---
 .mergify.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index a0c2ef1e9ee81..8b0f91c9c67b4 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,7 +10,6 @@ pull_request_rules:
         method: squash
         strict_method: merge
       delete_head_branch: {}
-      dismiss_reviews: {}
     conditions:
       - author!=dependabot[bot]
       - author!=dependabot-preview[bot]
@@ -23,6 +22,19 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success=AWS CodeBuild us-east-1 (aws-cdk-build)
       - status-success=Semantic Pull Request
+  - name: automatically merge dependabot
+    actions:
+      comment:
+        message: Thanks for keeping us safe dependabot! ❤️
+      merge:
+        strict: smart
+        method: squash
+        strict_method: merge
+      delete_head_branch: {}
+    conditions:
+      - author=dependabot[bot]
+      - author=dependabot-preview[bot]
+      - status-success=AWS CodeBuild us-east-1 (aws-cdk-build)
   - name: comment checklist
     actions:
       label:
@@ -69,6 +81,7 @@ pull_request_rules:
     conditions:
       - author!=dependabot[bot]
       - author!=dependabot-preview[bot]
+      - author!=@aws/aws-cdk-core
       - base=master
   - name: if fails conventional commits
     actions: