Commit ff8c632a authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

Merge pull request #2385 from mslipper/feat/merge-queue

ci: Merge using merge queue
parents 70897fa4 51192b22
queue_rules:
- name: default
conditions: []
pull_request_rules: pull_request_rules:
- name: Automatic merge on approval - name: Automatic merge on approval
conditions: conditions:
...@@ -17,7 +21,8 @@ pull_request_rules: ...@@ -17,7 +21,8 @@ pull_request_rules:
- "approved-reviews-by=tynes" - "approved-reviews-by=tynes"
- "approved-reviews-by=smartcontracts" - "approved-reviews-by=smartcontracts"
actions: actions:
merge: queue:
name: default
method: squash method: squash
- name: Handle security critical PRs - name: Handle security critical PRs
conditions: conditions:
...@@ -59,4 +64,11 @@ pull_request_rules: ...@@ -59,4 +64,11 @@ pull_request_rules:
- conflict - conflict
actions: actions:
comment: 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.
\ No newline at end of file - 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.
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment