Skip to content

ci: Merge using merge queue #2385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mslipper merged 1 commit into from
Mar 31, 2022
Merged

ci: Merge using merge queue #2385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
queue_rules:
- name: default
conditions: []

pull_request_rules:
- name: Automatic merge on approval
conditions:
Expand All @@ -17,7 +21,8 @@ pull_request_rules:
- "approved-reviews-by=tynes"
- "approved-reviews-by=smartcontracts"
actions:
merge:
queue:
name: default
method: squash
- name: Handle security critical PRs
conditions:
Expand Down Expand Up @@ -59,4 +64,11 @@ pull_request_rules:
- conflict
actions:
comment:
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
- name: Notify author when added to merge queue
conditions:
- "check-success=Queue: Embarked on merge train"
actions:
comment:
message: |
This PR has been added to the merge train, and will be merged soon.