From e9ce53c2b67a76801dda927c5c3fc6fe4996c152 Mon Sep 17 00:00:00 2001
From: Oliver Kurz <okurz@suse.de>
Date: Tue, 12 Oct 2021 09:59:05 +0200
Subject: [PATCH 1/2] Add mergify configuration
---
.mergify.yml | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 .mergify.yml
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..3118f5f
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,33 @@
+pull_request_rules:
+ - name: automatic merge
+ conditions:
+ - and: &base_checks
+ - base=master
+ - -label~=^acceptance-tests-needed|not-ready
+ - status-success=integration
+ - status-success=unit
+ - and:
+ - "#approved-reviews-by>=1"
+ - "#changes-requested-reviews-by=0"
+ # https://doc.mergify.io/examples.html#require-all-requested-reviews-to-be-approved
+ - "#review-requested=0"
+ actions:
+ merge:
+ method: merge
+ - name: automatic merge on special label
+ conditions:
+ - and: *base_checks
+ - and:
+ # mergify config checks needs at least two rules in "and" so we repeat
+ # one from the base checks
+ - base=master
+ - label=merge-fast
+ actions:
+ merge:
+ method: merge
+ - name: ask to resolve conflict
+ conditions:
+ - conflict
+ actions:
+ comment:
+ message: This pull request is now in conflicts. Could you fix it? 🙏
From f7bacc5379f3fa9d718fa07e0a49dca9d87216ef Mon Sep 17 00:00:00 2001
From: Oliver Kurz <okurz@suse.de>
Date: Sat, 27 Jul 2024 11:58:09 +0200
Subject: [PATCH 2/2] CI: Be more safe needing 2 approvals
---
.mergify.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mergify.yml b/.mergify.yml
index 3118f5f..b0b1dfd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -7,7 +7,7 @@ pull_request_rules:
- status-success=integration
- status-success=unit
- and:
- - "#approved-reviews-by>=1"
+ - "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
# https://doc.mergify.io/examples.html#require-all-requested-reviews-to-be-approved
- "#review-requested=0"