From 225117cef561970d96ebb8cee982bcde72061825 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:32:57 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 68 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index b1e74cf22f0..c6412db74ab 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,16 +1,43 @@ queue_rules: - - name: default - conditions: + - name: duplicated default from Merge for bots + queue_conditions: + - base~=(mainline|rename-commands) + - "#approved-reviews-by>=2" + - approved-reviews-by=@aws/aws-ecs-devx + - -approved-reviews-by~=author - status-success=build (compile-linux) - status-success=build (compile-windows) - status-success=build (compile-darwin) - status-success=test - status-success=staticcheck - status-success=license + - -label~=(WIP|do-not-merge) + - -title~=(WIP|wip) + - -merged + - -closed + - author!=dependabot[bot] + - base=mainline + - "#approved-reviews-by>=1" + - "#changes-requested-reviews-by=0" + - status-success=build (compile-linux) + - status-success=build (compile-windows) + - status-success=build (compile-darwin) + - status-success=test + - status-success=staticcheck + - status-success=license + - author=dependabot[bot] + - -title~=(WIP|wip) + - -label~=(WIP|do-not-merge) + - -merged + - -closed + merge_conditions: [] + commit_message_template: | + {{ title }} (#{{ number }}) -pull_request_rules: - - name: Merge for developers - conditions: + {{ body }} + merge_method: squash + - name: default + queue_conditions: - base~=(mainline|rename-commands) - "#approved-reviews-by>=2" - approved-reviews-by=@aws/aws-ecs-devx @@ -26,14 +53,20 @@ pull_request_rules: - -merged - -closed - author!=dependabot[bot] - actions: - queue: - name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) + merge_conditions: + - status-success=build (compile-linux) + - status-success=build (compile-windows) + - status-success=build (compile-darwin) + - status-success=test + - status-success=staticcheck + - status-success=license + commit_message_template: | + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: squash - {{ body }} +pull_request_rules: - name: Merge for bots conditions: - base=mainline @@ -53,13 +86,6 @@ pull_request_rules: actions: review: type: APPROVE - queue: - name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - - {{ body }} - name: Ask Japanese docs reviews conditions: - files~=\.ja.md$ @@ -68,3 +94,7 @@ pull_request_rules: request_reviews: users: - hkford + - name: Merge for bots + Merge for developers + conditions: [] + actions: + queue: