Skip to content

Commit

Permalink
chore(mergify): update queue rules minimum required conditions (#31945)
Browse files Browse the repository at this point in the history
### 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*
  • Loading branch information
moelasmar authored Oct 31, 2024
1 parent 15abd88 commit 7904f2a
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down

0 comments on commit 7904f2a

Please sign in to comment.