From 6f306adc7ac12cb24ec0cad2a543976464b037b8 Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <nija@amazon.com>
Date: Wed, 9 Dec 2020 14:21:14 +0000
Subject: [PATCH] chore: apply mergify rules to v2-main branch (#11939)

The same set of mergify rules are used for 'master' and 'v2-main'
branches.

With these changes, regular PRs from contributors get auto-merged. This
is currently not the case.

This also removes any special rules for v2 and reduces the number of
rules.
---
 .mergify.yml | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 2675841005330..97ca6d16de18b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -19,7 +19,6 @@ pull_request_rules:
         commit_message: title+body
     conditions:
       - base!=release
-      - -base~=^v2
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge|no-squash|two-approvers)
       - -merged
@@ -34,7 +33,7 @@ pull_request_rules:
   - name: automatic merge (2+ approvers)
     actions:
       comment:
-        message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
+        message: Thank you for contributing! Your pull request will be automatically updated and merged (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       merge:
         strict: smart
         method: squash
@@ -42,7 +41,6 @@ pull_request_rules:
         commit_message: title+body
     conditions:
       - base!=release
-      - -base~=^v2
       - -title~=(WIP|wip)
       - label~=two-approvers
       - -label~=(blocked|do-not-merge|no-squash)
@@ -58,7 +56,7 @@ pull_request_rules:
   - name: automatic merge (no-squash)
     actions:
       comment:
-        message: Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
+        message: Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       merge:
         strict: smart
         # Merge instead of squash
@@ -66,7 +64,6 @@ pull_request_rules:
         strict_method: merge
         commit_message: title+body
     conditions:
-      - -base~=^v2
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)
       # Only if no-squash is set
@@ -121,22 +118,4 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
-      - status-success=validate-pr
-  - name: automatic merge of v2 forward merges
-    actions:
-      comment:
-        message: Forward merge successful!
-      merge:
-        method: merge
-        strict: smart+fasttrack
-        strict_method: merge
-        commit_message: title+body
-    conditions:
-      - base=v2-main
-      - label~=forward-merge
-      - -label~=(blocked|do-not-merge)
-      - -merged
-      - -closed
-      - author~=aws-cdk-automation
-      - "#approved-reviews-by>=1"
-      - status-success~=AWS CodeBuild us-east-1
+      - status-success=validate-pr
\ No newline at end of file