From 6bb9f93462ca9b46871370ecf4a1937127eaf22a Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:19:22 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index c3055fc..08e3bbe 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,10 +1,17 @@ queue_rules: - name: default - conditions: + queue_conditions: + - base=master + - author=scala-steward + - check-success~=build \(2.12.\d+\) + - check-success~=build \(2.13.\d+\) + - check-success~=build \(3.\d+.\d+\) + merge_conditions: # Conditions to get out of the queue (= merged) - check-success~=build \(2.12.\d+\) - check-success~=build \(2.13.\d+\) - check-success~=build \(3.\d+.\d+\) + merge_method: squash pull_request_rules: - name: assign and label scala-steward's PRs @@ -14,13 +21,6 @@ pull_request_rules: label: add: [dependency-update] - name: merge scala-steward's PRs - conditions: - - base=master - - author=scala-steward - - check-success~=build \(2.12.\d+\) - - check-success~=build \(2.13.\d+\) - - check-success~=build \(3.\d+.\d+\) + conditions: [] actions: queue: - name: default - method: squash