From dc73791f35dff0484a35ddedba4b58c6ca34c3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 22 Jan 2025 22:55:55 +0000
Subject: [PATCH 1/4] update script for new mergify syntax (#6597)

---
 .github/mergify.yml | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4c4046cf67..ff08f2d349 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,3 +1,36 @@
+pull_request_rules:
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - -author=dependabot[bot]
+      - or:
+          - -draft # Don't report conflicts on regular draft.
+          - and: # Do report conflicts on draft that are scheduled for the next major release.
+              - draft
+              - milestone~=v[0-9]\.[0-9]{2}
+    actions:
+      comment:
+        message: This pull request has merge conflicts. Could you please resolve them
+          @{{author}}? 🙏
+
+  - name: Approve trivial maintainer PRs
+    conditions:
+      - base=master
+      - label=trivial
+      - author=@sigp/lighthouse
+    actions:
+      review:
+        type: APPROVE
+
+  - name: Add ready-to-merge labeled PRs to merge queue
+    conditions:
+      # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
+      - base=master
+      - label=send-it
+    actions:
+      queue:
+
+
 queue_rules:
   - name: default
     batch_size: 8
@@ -6,10 +39,11 @@ queue_rules:
     merge_method: squash
     commit_message_template: |
       {{ title }} (#{{ number }})
-      
-      {% for commit in commits %}
-      * {{ commit.commit_message }}
-      {% endfor %}
+
+        {{ body | get_section("## Issue Addressed", "") }}
+
+
+        {{ body | get_section("## Proposed Changes", "") }}
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"

From 6b6f2beb7d1736a07b68de8ef4ffa1c8e4b5feab Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Thu, 23 Jan 2025 11:01:11 +1100
Subject: [PATCH 2/4] Fix branch/tag names in mergify config (#6842)

---
 .github/mergify.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index ff08f2d349..9a74414e72 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -15,7 +15,7 @@ pull_request_rules:
 
   - name: Approve trivial maintainer PRs
     conditions:
-      - base=master
+      - base=unstable
       - label=trivial
       - author=@sigp/lighthouse
     actions:
@@ -25,8 +25,8 @@ pull_request_rules:
   - name: Add ready-to-merge labeled PRs to merge queue
     conditions:
       # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
-      - base=master
-      - label=send-it
+      - base=unstable
+      - label=ready-to-merge
     actions:
       queue:
 

From 029b4f21047c37d1ffde51c554737b1aa0880f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 24 Jan 2025 00:43:51 +0000
Subject: [PATCH 3/4] Improve mergify config (#6852)

* improve mergify config

* negate conflict
---
 .github/mergify.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 9a74414e72..1aa24f8302 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -18,6 +18,7 @@ pull_request_rules:
       - base=unstable
       - label=trivial
       - author=@sigp/lighthouse
+      - -conflict
     actions:
       review:
         type: APPROVE
@@ -26,11 +27,11 @@ pull_request_rules:
     conditions:
       # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
       - base=unstable
-      - label=ready-to-merge
+      - label=ready-for-merge
+      - label!=do-not-merge
     actions:
       queue:
 
-
 queue_rules:
   - name: default
     batch_size: 8
@@ -48,6 +49,7 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"
       - "check-success=target-branch-check"
+      - "label!=do-not-merge"
     merge_conditions:
       - "check-success=test-suite-success"
       - "check-success=local-testnet-success"

From bf955c7543dac8911a6f6c334b5b3ca4ef728d9c Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmy@sigmaprime.io>
Date: Fri, 14 Feb 2025 10:23:38 +1100
Subject: [PATCH 4/4] Update mergify conditions for `trivial` and
 `ready-for-merge` labels to satisfy if base is not `stable`  (#6997)

---
 .github/mergify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 1aa24f8302..73267904b8 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -15,7 +15,7 @@ pull_request_rules:
 
   - name: Approve trivial maintainer PRs
     conditions:
-      - base=unstable
+      - base!=stable
       - label=trivial
       - author=@sigp/lighthouse
       - -conflict
@@ -26,7 +26,7 @@ pull_request_rules:
   - name: Add ready-to-merge labeled PRs to merge queue
     conditions:
       # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
-      - base=unstable
+      - base!=stable
       - label=ready-for-merge
       - label!=do-not-merge
     actions: