From 2041d69312f3ddd51001b10fe46e96dc8b69f056 Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 14 Apr 2022 17:15:57 +1000 Subject: [PATCH] ci(Mergify): Fix invalid mergify config on main branch (#4120) Signed-off-by: teor --- .github/mergify.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index d913448c..fbed8628 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -4,8 +4,8 @@ queue_rules: allow_checks_interruption: False speculative_checks: 1 batch_size: 5 - # Just wait 2 minutes to embark hotfixes together in a merge train - batch_max_wait_time: 120 + # Wait a short time to embark hotfixes together in a merge train + batch_max_wait_time: "2 minutes" conditions: # Mergify automatically applies status check, approval, and conversation rules, # which are the same as the GitHub main branch protection rules @@ -17,8 +17,8 @@ queue_rules: allow_checks_interruption: True speculative_checks: 1 batch_size: 5 - # Wait 10 minutes to embark high priority tickets together in a merge train - batch_max_wait_time: 300 + # Wait for a few minutes to embark high priority tickets together in a merge train + batch_max_wait_time: "5 minutes" conditions: - base=main @@ -27,8 +27,8 @@ queue_rules: allow_checks_interruption: True speculative_checks: 1 batch_size: 5 - # Wait 10 minutes to embark low priority tickets together in a merge train - batch_max_wait_time: 300 + # Wait a bit longer to embark low priority tickets together in a merge train + batch_max_wait_time: "10 minutes" conditions: - base=main @@ -70,4 +70,4 @@ pull_request_rules: actions: queue: name: low - method: squash + method: squash \ No newline at end of file