From 258f1abc458c3ee316a5fd38c0200d5c43843366 Mon Sep 17 00:00:00 2001
From: Stefan Arentz <stefan@arentz.ca>
Date: Fri, 18 Dec 2020 10:51:55 -0500
Subject: [PATCH] Update mergify to recognize old and new task graphs for
 release builds (#17121)

---
 .mergify.yml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1f3f66814d..77dd75d3f4 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -29,7 +29,7 @@ pull_request_rules:
       merge:
         method: rebase
         strict: smart
-  - name: Release automation
+  - name: Release automation (Old)
     conditions:
       - base~=releases[_/].*
       - author=github-actions[bot]
@@ -56,3 +56,31 @@ pull_request_rules:
         strict: smart
       delete_head_branch:
         force: false
+  - name: Release automation (New)
+    conditions:
+      - base~=releases[_/].*
+      - author=github-actions[bot]
+      # Listing checks manually beause we do not have a "push complete" check yet.
+      - check-success=build-android-test-beta
+      - check-success=build-android-test-debug
+      - check-success=build-beta-firebase
+      - check-success=build-debug
+      - check-success=build-nightly-simulation
+      - check-success=lint-compare-locales
+      - check-success=lint-detekt
+      - check-success=lint-ktlint
+      - check-success=lint-lint
+      - check-success=signing-android-test-beta
+      - check-success=signing-beta-firebase
+      - check-success=signing-nightly-simulation
+      - check-success=test-debug
+      - files~=(AndroidComponents.kt)
+    actions:
+      review:
+        type: APPROVE
+        message: 🚢
+      merge:
+        method: rebase
+        strict: smart
+      delete_head_branch:
+        force: false