From fdd086f39af7897306812e5f209973a157cf93fd Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:28:58 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index c5e9be00a..f81ff6743 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,31 +1,31 @@ queue_rules: - - name: default - conditions: + - name: duplicated default from merge scala-steward's PRs + queue_conditions: + - "#approved-reviews-by>=1" + - author=scala-steward - check-success=test (8, 2.13.7) - check-success=test (11, 2.13.7) - check-success=testPY (11, 2.13.7, 3.5) - check-success=testJS (11, 2.13.7) - check-success=testWithCoverageReport (8) - check-success=buildWithGraal (2.13.7) - -pull_request_rules: - - name: Automatic merge on approval - conditions: + merge_conditions: [] + merge_method: merge + method: squash + - name: default + queue_conditions: - "#approved-reviews-by>=1" - actions: - queue: - method: merge - name: default - - name: merge scala-steward's PRs - conditions: - - author=scala-steward + merge_conditions: - check-success=test (8, 2.13.7) - check-success=test (11, 2.13.7) - check-success=testPY (11, 2.13.7, 3.5) - check-success=testJS (11, 2.13.7) - check-success=testWithCoverageReport (8) - check-success=buildWithGraal (2.13.7) + merge_method: merge + +pull_request_rules: + - name: refactored queue action rule + conditions: [] actions: queue: - method: squash - name: default \ No newline at end of file