From 7904f2a13d68cf664d52bc458985560000d0a075 Mon Sep 17 00:00:00 2001
From: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:31:57 -0700
Subject: [PATCH] chore(mergify): update queue rules minimum required
 conditions (#31945)

### Reason for this change

Update the Mergify queue rules, so if the [mergify queue command](https://docs.mergify.com/commands/queue/) used it will use the correct queue based on the conditions added to each queue, and to avoid human mistakes if this command used and the PR does not fulfill the minimum requirements to be merged.

### Description of changes

Updated the default-merge, and default-squash queues to add the minimum requirements before to be checked before adding a PR to that queue.

### Checklist
- [X] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .mergify.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 24f5698c49f27..55a700cee4e2f 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,7 +4,17 @@ queue_rules:
     update_method: merge
     merge_method: merge
     conditions:
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge)
+      # Only if no-squash is set
+      - label~=no-squash
+      - -merged
+      - -closed
+      - "#approved-reviews-by>=1"
+      - -approved-reviews-by~=author
+      - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
+      - status-success=validate-pr
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -13,7 +23,16 @@ queue_rules:
     update_method: merge
     merge_method: squash
     conditions:
+      - base!=release
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge|no-squash)
+      - -merged
+      - -closed
+      - "#approved-reviews-by>=1"
+      - -approved-reviews-by~=author
+      - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
+      - status-success=validate-pr
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}