From 3551f79c667f02734b761a65131e91320b620305 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Wed, 18 Dec 2024 12:33:57 -0600 Subject: [PATCH 1/5] fix(mergify): Mergify config needs adjusting for latest mergify releases --- .mergify.yml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 876d88127a1..f8a17fdec76 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,61 +1,73 @@ queue_rules: - name: default - conditions: - - status-success=build + merge_method: squash + queue_conditions: + - check-success=build + merge_conditions: + - check-success=build pull_request_rules: + - name: Make sure PR are up to date before merging + description: This automatically updates PRs when they are out-of-date with the + base branch to avoid semantic conflicts (next step is using a merge queue). + conditions: [] + actions: + update: + - name: Automatically merge backports to releases on succesful build + conditions: + - base~=^(release-) + - head~=^mergify\/bp\/ + - "author=mergify[bot]" + actions: + queue: + name: default + label: + add: ["auto merged"] - name: Automatically merge on CI success and review conditions: - base=master - - status-success=build - "label=ready to merge" - "approved-reviews-by=@oss-approvers" + - "#approved-reviews-by>=1" actions: queue: - method: squash name: default label: add: ["auto merged"] - name: Automatically merge release branch changes on CI success and release manager review conditions: - base~=^release- - - status-success=build - "label=ready to merge" - "approved-reviews-by=@release-managers" actions: queue: - method: squash name: default label: add: ["auto merged"] - name: Automatically merge PRs from maintainers on CI success and review conditions: - base=master - - status-success=build - "label=ready to merge" - "author=@oss-approvers" + - "#approved-reviews-by>=1" actions: queue: - method: squash name: default label: add: ["auto merged"] - name: Automatically merge autobump PRs on CI success conditions: - base~=^(master|release-) - - status-success=build - "label~=autobump-*" - "author:spinnakerbot" actions: queue: - method: squash name: default label: add: ["auto merged"] - name: Request reviews for autobump PRs on CI failure conditions: - base~=^(master|release-) - - status-failure=build - "label~=autobump-*" - base=master actions: From 02f8f786410afe8dac14a7e6185cd6c0acf6299f Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Wed, 18 Dec 2024 12:46:07 -0600 Subject: [PATCH 2/5] fix(mergify): Add integration test checks --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index f8a17fdec76..868d862d6f4 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,8 +3,10 @@ queue_rules: merge_method: squash queue_conditions: - check-success=build + - check-sucess=it-test merge_conditions: - check-success=build + - check-sucess=it-test pull_request_rules: - name: Make sure PR are up to date before merging From 68777f717fa20372bca2045ebd122ae8913ea990 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Wed, 18 Dec 2024 12:51:47 -0600 Subject: [PATCH 3/5] fix(mergify): Add integration test checks --- .mergify.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 868d862d6f4..f8a17fdec76 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,10 +3,8 @@ queue_rules: merge_method: squash queue_conditions: - check-success=build - - check-sucess=it-test merge_conditions: - check-success=build - - check-sucess=it-test pull_request_rules: - name: Make sure PR are up to date before merging From f6636579c3f733f6559bde1166a576629b856ed4 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Wed, 18 Dec 2024 13:03:20 -0600 Subject: [PATCH 4/5] fix(mergify): Add integration test checks --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index f8a17fdec76..13205f77e05 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,8 +3,10 @@ queue_rules: merge_method: squash queue_conditions: - check-success=build + - check-success=it-test merge_conditions: - check-success=build + - check-success=it-test pull_request_rules: - name: Make sure PR are up to date before merging From 1c8018c2062094692c9ba222e8533286405b8903 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Jan 2025 13:05:50 -0600 Subject: [PATCH 5/5] fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. --- .mergify.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 13205f77e05..501cf50af92 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,9 +4,6 @@ queue_rules: queue_conditions: - check-success=build - check-success=it-test - merge_conditions: - - check-success=build - - check-success=it-test pull_request_rules: - name: Make sure PR are up to date before merging