From 14955479aa0e604152a0fe4fcded935a1d6f7638 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:29:17 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 57f965ee..68a7a87b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,7 +2,15 @@ queue_rules: - name: default - conditions: + queue_conditions: + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build + - status-success=package-js + - status-success=package-java + - status-success=package-python + - status-success=package-dotnet + merge_conditions: - "#approved-reviews-by>=1" - -label~=(do-not-merge) - status-success=build @@ -10,17 +18,16 @@ queue_rules: - status-success=package-java - status-success=package-python - status-success=package-dotnet + merge_method: merge + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} + pull_request_rules: - name: Automatic merge on approval and successful build actions: delete_head_branch: {} - queue: - method: merge - name: default - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} conditions: - "#approved-reviews-by>=1" - -label~=(do-not-merge) @@ -29,3 +36,7 @@ pull_request_rules: - status-success=package-java - status-success=package-python - status-success=package-dotnet + - name: refactored queue action rule + conditions: [] + actions: + queue: