From 114108d2f5af018b8c8c11cf9898735e811015ba Mon Sep 17 00:00:00 2001
From: Chris Rybicki <chrisr@monada.co>
Date: Thu, 4 Jan 2024 12:20:56 -0500
Subject: [PATCH] chore: mergify fixes (#55)

---
 .mergify.yml | 96 ++++++++++++++++++++++++++--------------------------
 mergify.w    |  9 ++---
 2 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 8bbd422d..ab92783d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -32,30 +32,30 @@ pull_request_rules:
       - check-success=build
       - base=main
       - check-success=Validate PR title
-      - or:
-          - check-success=build-bedrock
-          - check-skipped=build-bedrock
-      - or:
-          - check-success=build-checks
-          - check-skipped=build-checks
-      - or:
-          - check-success=build-containers
-          - check-skipped=build-containers
-      - or:
-          - check-success=build-fifoqueue
-          - check-skipped=build-fifoqueue
-      - or:
-          - check-success=build-github
-          - check-skipped=build-github
-      - or:
-          - check-success=build-postgres
-          - check-skipped=build-postgres
-      - or:
-          - check-success=build-redis
-          - check-skipped=build-redis
-      - or:
-          - check-success=build-websockets
-          - check-skipped=build-websockets
+      - -check-failure=build-bedrock
+      - -check-pending=build-bedrock
+      - -check-stale=build-bedrock
+      - -check-failure=build-checks
+      - -check-pending=build-checks
+      - -check-stale=build-checks
+      - -check-failure=build-containers
+      - -check-pending=build-containers
+      - -check-stale=build-containers
+      - -check-failure=build-fifoqueue
+      - -check-pending=build-fifoqueue
+      - -check-stale=build-fifoqueue
+      - -check-failure=build-github
+      - -check-pending=build-github
+      - -check-stale=build-github
+      - -check-failure=build-postgres
+      - -check-pending=build-postgres
+      - -check-stale=build-postgres
+      - -check-failure=build-redis
+      - -check-pending=build-redis
+      - -check-stale=build-redis
+      - -check-failure=build-websockets
+      - -check-pending=build-websockets
+      - -check-stale=build-websockets
   - name: requires manual merge
     conditions:
       - files=.mergify.yml
@@ -70,30 +70,30 @@ pull_request_rules:
       - -approved-reviews-by~=author
       - base=main
       - check-success=Validate PR title
-      - or:
-          - check-success=build-bedrock
-          - check-skipped=build-bedrock
-      - or:
-          - check-success=build-checks
-          - check-skipped=build-checks
-      - or:
-          - check-success=build-containers
-          - check-skipped=build-containers
-      - or:
-          - check-success=build-fifoqueue
-          - check-skipped=build-fifoqueue
-      - or:
-          - check-success=build-github
-          - check-skipped=build-github
-      - or:
-          - check-success=build-postgres
-          - check-skipped=build-postgres
-      - or:
-          - check-success=build-redis
-          - check-skipped=build-redis
-      - or:
-          - check-success=build-websockets
-          - check-skipped=build-websockets
+      - -check-failure=build-bedrock
+      - -check-pending=build-bedrock
+      - -check-stale=build-bedrock
+      - -check-failure=build-checks
+      - -check-pending=build-checks
+      - -check-stale=build-checks
+      - -check-failure=build-containers
+      - -check-pending=build-containers
+      - -check-stale=build-containers
+      - -check-failure=build-fifoqueue
+      - -check-pending=build-fifoqueue
+      - -check-stale=build-fifoqueue
+      - -check-failure=build-github
+      - -check-pending=build-github
+      - -check-stale=build-github
+      - -check-failure=build-postgres
+      - -check-pending=build-postgres
+      - -check-stale=build-postgres
+      - -check-failure=build-redis
+      - -check-pending=build-redis
+      - -check-stale=build-redis
+      - -check-failure=build-websockets
+      - -check-pending=build-websockets
+      - -check-stale=build-websockets
     actions:
       comment:
         message: Thank you for contributing! Your pull request contains mergify
diff --git a/mergify.w b/mergify.w
index a7a384c5..d42cc6e8 100644
--- a/mergify.w
+++ b/mergify.w
@@ -5,12 +5,9 @@ pub class MergifyWorkflow {
     let buildChecks = MutArray<Json>[];
     buildChecks.push("check-success=Validate PR title");
     for lib in libs {
-      buildChecks.push(Json {
-        "or": [
-          "check-success=build-{lib}",
-          "check-skipped=build-{lib}",
-        ]
-      });
+      buildChecks.push("-check-failure=build-{lib}");
+      buildChecks.push("-check-pending=build-{lib}");
+      buildChecks.push("-check-stale=build-{lib}");
     }
 
     fs.writeYaml(".mergify.yml", {