From 45b9f0b039542401288ea872268a902f1aebcecb Mon Sep 17 00:00:00 2001
From: brandon s allbery kf8nh <allbery.b@gmail.com>
Date: Tue, 9 Apr 2024 18:31:09 -0400
Subject: [PATCH] add squash+merge strategy for backports

---
 .github/mergify.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index b0dbe1033b8..4a1efe926a8 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -71,6 +71,21 @@ pull_request_rules:
       - body~=backport
       - '#approved-reviews-by>=1'
 
+  # merge+squash strategy for backports: require 1 approver instead of 2
+  - actions:
+      queue:
+        name: default
+        method: squash
+        # both update methods get absorbed by the squash, so we use the most
+        # reliable
+        update_method: merge
+    name: Put backports in the squash+merge queue
+    conditions:
+      - label=squash+merge me
+      - base!=master
+      - body~=backport
+      - '#approved-reviews-by>=1'
+
   # backports should be labeled as such
   - actions:
       label: