From 9ebfc61a8dd532885cb5eba4c694fe97222485f4 Mon Sep 17 00:00:00 2001
From: Felix Divo <4403130+felixdivo@users.noreply.github.com>
Date: Mon, 25 Oct 2021 22:44:32 +0200
Subject: [PATCH 1/2] Update Mergify rules

This change was required due to the deprection of our current setup (https://blog.mergify.io/strict-mode-deprecation/). It was shown in the mergify results tab on our PRs and would cause the Mergify setup to fail from December on. I hope that I nowconfigured everything correctly.
---
 .mergify.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 9a6141e6d..afe459fb3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,16 +1,22 @@
+queue_rules:
+  - name: default
+    conditions:
+      - "status-success=Travis CI - Pull Request"
+
 pull_request_rules:
   - name: Automatic merge passing PR on up to date branch with approving CR
     conditions:
+      - "base=develop"
       - "#approved-reviews-by>=1"
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
       - "status-success=Travis CI - Pull Request"
       - "label!=work-in-progress"
     actions:
-      merge:
-        method: merge
-        strict: smart+fasttrack
-  - name: Request Brian to review changes on core api.
+      queue:
+        name: default
+
+  - name: Request Brian to review changes to the core API
     conditions:
       - "-files~=^can/interfaces/$"
       - "-closed"
@@ -20,7 +26,7 @@ pull_request_rules:
         users:
           - hardbyte
 
-  - name: delete head branch after merge
+  - name: Delete head branch after merge
     conditions:
       - merged
     actions:

From f2860f6462d5e61552aa9ec631d3b59899f252d2 Mon Sep 17 00:00:00 2001
From: Felix Divo <4403130+felixdivo@users.noreply.github.com>
Date: Tue, 26 Oct 2021 08:30:09 +0200
Subject: [PATCH 2/2] Fix mergify to use Github Actions

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

diff --git a/.mergify.yml b/.mergify.yml
index afe459fb3..e2ded27f0 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,7 @@
 queue_rules:
   - name: default
     conditions:
-      - "status-success=Travis CI - Pull Request"
+      - "status-success=test,format"  # "GitHub Actions works slightly differently [...], only the job name is used."
 
 pull_request_rules:
   - name: Automatic merge passing PR on up to date branch with approving CR
@@ -10,7 +10,7 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
-      - "status-success=Travis CI - Pull Request"
+      - "status-success=test,format"
       - "label!=work-in-progress"
     actions:
       queue: