Skip to content

Commit 7904f2a

Browse files
authored
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*
1 parent 15abd88 commit 7904f2a

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

.mergify.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ queue_rules:
44
update_method: merge
55
merge_method: merge
66
conditions:
7+
- -title~=(WIP|wip)
8+
- -label~=(blocked|do-not-merge)
9+
# Only if no-squash is set
10+
- label~=no-squash
11+
- -merged
12+
- -closed
13+
- "#approved-reviews-by>=1"
14+
- -approved-reviews-by~=author
15+
- "#changes-requested-reviews-by=0"
716
- status-success~=AWS CodeBuild us-east-1
17+
- status-success=validate-pr
818
commit_message_template: |-
919
{{ title }} (#{{ number }})
1020
{{ body }}
@@ -13,7 +23,16 @@ queue_rules:
1323
update_method: merge
1424
merge_method: squash
1525
conditions:
26+
- base!=release
27+
- -title~=(WIP|wip)
28+
- -label~=(blocked|do-not-merge|no-squash)
29+
- -merged
30+
- -closed
31+
- "#approved-reviews-by>=1"
32+
- -approved-reviews-by~=author
33+
- "#changes-requested-reviews-by=0"
1634
- status-success~=AWS CodeBuild us-east-1
35+
- status-success=validate-pr
1736
commit_message_template: |-
1837
{{ title }} (#{{ number }})
1938
{{ body }}

0 commit comments

Comments
 (0)