From 512a13da86da98475b4dc348e860bf93ef9eacdf Mon Sep 17 00:00:00 2001 From: "J. K. Edwards" Date: Sun, 12 Jan 2025 08:48:52 -0500 Subject: [PATCH] Update mergify.yml Signed-off-by: J. K. Edwards --- .workflow/mergify.yml | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/.workflow/mergify.yml b/.workflow/mergify.yml index 343a8a0..e7a62b8 100644 --- a/.workflow/mergify.yml +++ b/.workflow/mergify.yml @@ -52,6 +52,62 @@ queue_rules: - check-success=handle_pull_request - check-success=handle_review <<<<<<< bearycool11-patch-11 +pull_request_rules: + - name: Automatic merge on approval + conditions: + - base=main + - "#approved-reviews-by>=1" + - check-success=get_current_step + - check-success=handle_pull_request + - check-success=handle_review + actions: + merge: + method: squash + strict: true + commit_message: title+body + + - name: Delete head branch after merge + conditions: + - merged + actions: + delete_head_branch: {} + +queue_rules: + - name: default + conditions: + - check-success=get_current_step + - check-success=handle_pull_request + - check-success=handle_review + +pull_request_rules: + - name: Automatic merge on approval + conditions: + - base=main + - "#approved-reviews-by>=1" + - check-success=get_current_step + - check-success=handle_pull_request + - check-success=handle_review + actions: + merge: + method: squash + strict: true + commit_message: title+body + + - name: Delete head branch after merge + conditions: + - merged + actions: + delete_head_branch: {} + +queue_rules: + - name: default + conditions: + - check-success=get_current_step + - check-success=handle_pull_request + - check-success=handle_review +======= +>>>>>>> main +<<<<<<< bearycool11-patch-11 ======= pull_request_rules: @@ -165,3 +221,4 @@ queue_rules: - check-success=handle_pull_request - check-success=handle_review >>>>>>> main +