From b71692c2f080c66357beb5683a674ed60f03e602 Mon Sep 17 00:00:00 2001
From: Thom Chiovoloni <chiovolonit@gmail.com>
Date: Mon, 29 Jun 2020 10:45:22 -0700
Subject: [PATCH] Fix mergify config, hopefully

---
 .mergify.yml | 54 +++++++++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index a0633543c..d173249b2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -17,16 +17,14 @@ pull_request_rules:
       - "status-success=android-build-pr"
       - "status-success=lint-detekt"
       - "status-success=lint-ktlint"
-      - "status-success=ci/circleci: Check Protobuf files are up-to-date"
-      - "status-success=ci/circleci: Check Rust dependencies"
-      - "status-success=ci/circleci: Check Rust formatting"
-      - "status-success=ci/circleci: Check Swift formatting"
-      - "status-success=ci/circleci: Lint Bash scripts"
-      - "status-success=ci/circleci: Lint Rust with clippy"
-      - "status-success=ci/circleci: Rust benchmarks"
-      - "status-success=ci/circleci: Rust tests"
-      - "status-success=ci/circleci: Sync integration tests"
-      - "status-success=ci/circleci: iOS build and test"
+      - "status-success=check-protobuf-uptodate"
+      - "status-success=check-dependencies"
+      - "status-success=check-formatting"
+      - "status-success=swiftlint"
+      - "status-success=bash-lint"
+      - "status-success=clippy"
+      - "status-success=run-tests"
+      - "status-success=carthage-framework"
     actions:
       merge:
         method: merge
@@ -53,16 +51,14 @@ pull_request_rules:
       - "status-success=module-build-native-support"
       - "status-success=lint-detekt"
       - "status-success=lint-ktlint"
-      - "status-success=ci/circleci: Check Protobuf files are up-to-date"
-      - "status-success=ci/circleci: Check Rust dependencies"
-      - "status-success=ci/circleci: Check Rust formatting"
-      - "status-success=ci/circleci: Check Swift formatting"
-      - "status-success=ci/circleci: Lint Bash scripts"
-      - "status-success=ci/circleci: Lint Rust with clippy"
-      - "status-success=ci/circleci: Rust benchmarks"
-      - "status-success=ci/circleci: Rust tests"
-      - "status-success=ci/circleci: Sync integration tests"
-      - "status-success=ci/circleci: iOS build and test"
+      - "status-success=check-protobuf-uptodate"
+      - "status-success=check-dependencies"
+      - "status-success=check-formatting"
+      - "status-success=swiftlint"
+      - "status-success=bash-lint"
+      - "status-success=clippy"
+      - "status-success=run-tests"
+      - "status-success=carthage-framework"
     actions:
       merge:
         method: merge
@@ -74,16 +70,14 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
       - base=master
       - label=checkin-needed
-      - "status-success=ci/circleci: Check Protobuf files are up-to-date"
-      - "status-success=ci/circleci: Check Rust dependencies"
-      - "status-success=ci/circleci: Check Rust formatting"
-      - "status-success=ci/circleci: Check Swift formatting"
-      - "status-success=ci/circleci: Lint Bash scripts"
-      - "status-success=ci/circleci: Lint Rust with clippy"
-      - "status-success=ci/circleci: Rust benchmarks"
-      - "status-success=ci/circleci: Rust tests"
-      - "status-success=ci/circleci: Sync integration tests"
-      - "status-success=ci/circleci: iOS build and test"
+      - "status-success=check-protobuf-uptodate"
+      - "status-success=check-dependencies"
+      - "status-success=check-formatting"
+      - "status-success=swiftlint"
+      - "status-success=bash-lint"
+      - "status-success=clippy"
+      - "status-success=run-tests"
+      - "status-success=carthage-framework"
     actions:
       merge:
         method: merge