From c67708f64831c71ee00bf59b8952afb19c19120d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:41:12 -0500 Subject: [PATCH] ci(mergify): upgrade configuration to current format (#11) Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> --- .mergify.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index b09b64a..6a7e82e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,9 +1,16 @@ queue_rules: - name: default + queue_conditions: + - base = main + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build + merge_conditions: [] commit_message_template: |- {{ title }} (#{{ number }}) {{ body }} merge_method: squash + pull_request_rules: - name: Put PRs in queue (squash) conditions: @@ -13,8 +20,6 @@ pull_request_rules: - status-success=build actions: delete_head_branch: - queue: - merge_method: squash - name: Label core contributions actions: label: @@ -31,5 +36,9 @@ pull_request_rules: conditions: - label=contribution/core - label!=auto-merge + - name: refactored queue action rule + conditions: [] + actions: + queue: merge_queue: max_parallel_checks: 1