Skip to content

Commit

Permalink
chore(merge-queue): adding a new merge queue to tackle priority PR (#…
Browse files Browse the repository at this point in the history
…33294)

### Issue # (if applicable)

Closes NA.

### Reason for this change

Adding a new merge queue to handle PRs that include a single commit like [PR with custom resource](#32904) changes that causes issue while releasing with other changes.


### Description of changes

Update mergify.yml to add new merge queue.

### Describe any new or updated permissions being added

No permissions related changes

### Description of how you validated changes

yarn build
yarn test

### 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
shikha372 authored Feb 4, 2025
1 parent 20d8427 commit 3403da4
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,32 @@ queue_rules:
{{ body }}
- name: default-squash
update_method: merge
merge_method: squash
conditions:
- base!=release
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge|no-squash|priority-pr)
- -merged
- -closed
- "#approved-reviews-by>=1"
- -approved-reviews-by~=author
# This is important! It makes the PR Linter work.
- "#changes-requested-reviews-by=0"
- status-success~=AWS CodeBuild us-east-1
- status-success=validate-pr
commit_message_template: |-
{{ title }} (#{{ number }})
{{ body }}
- name: priority-squash
update_method: merge
merge_method: squash
conditions:
- base!=release
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge|no-squash)
- label~=priority-pr
- -merged
- -closed
- "#approved-reviews-by>=1"
Expand Down

0 comments on commit 3403da4

Please sign in to comment.