diff --git a/.github/mergify.yml b/.github/mergify.yml index 542551106bf65..d61ff0f98cf00 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,3 +1,7 @@ +queue_rules: + - name: default + conditions: [] + pull_request_rules: - name: Automatic merge on approval conditions: @@ -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: @@ -59,4 +64,11 @@ pull_request_rules: - conflict actions: comment: - message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review. \ No newline at end of file + 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. \ No newline at end of file