From fb51b8605f25b77b59c787387f332a6d41b47c3f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:21:02 -0500 Subject: [PATCH] ci(mergify): upgrade configuration to current format (#6414) * ci(mergify): upgrade configuration to current format * their automated process didn't clean up the now empty rule Signed-off-by: Amndeep Singh Mann --------- Signed-off-by: Amndeep Singh Mann Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Amndeep Singh Mann --- .github/mergify.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 569a0d81de..d86ba8ef54 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,17 +1,13 @@ queue_rules: - - name: default - conditions: + - name: default # automatic merge for master when reviewed and CI passes + queue_conditions: + - label=ready-to-merge + merge_conditions: - "#approved-reviews-by>=1" - base=master + merge_method: squash pull_request_rules: - - name: automatic merge for master when reviewed and CI passes - conditions: - - label=ready-to-merge - actions: - queue: - name: default - method: squash - name: delete head branch after merge conditions: - merged @@ -22,5 +18,5 @@ pull_request_rules: - conflict - -author~=^dependabot(|-preview)\[bot\]$ actions: - comment: - message: This pull request has a conflict. Could you fix it @{{author}}? + comment: + message: This pull request has a conflict. Could you fix it @{{author}}?