From d8192604a80faedecf158ddc6f446a8244485130 Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Fri, 12 May 2023 11:13:25 -0700
Subject: [PATCH 1/2] Move clang tidy v2 build to prod. (#41985)

The mac clang tidy build has been running successfully on staging for several days. This is also moving the ios and host legacy clang tidy builds to staging.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
---
 .ci.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.ci.yaml b/.ci.yaml
index b10e23ecd1ee8..814a5adf868d1 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -376,6 +376,25 @@ targets:
     properties:
       config_name: mac_android_aot_engine
 
+  - name: Mac mac_clang_tidy
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      config_name: mac_clang_tidy
+    runIf:
+      - DEPS
+      - .ci.yaml
+      - tools/**
+      - ci/**
+      - "**.h"
+      - "**.c"
+      - "**.cc"
+      - "**.fbs"
+      - "**.frag"
+      - "**.vert"
+      - "**.m"
+      - "**.mm"
+
   - name: Mac mac_host_engine
     recipe: engine_v2/engine_v2
     timeout: 60
@@ -410,6 +429,7 @@ targets:
     timeout: 75
 
   - name: Mac Host clang-tidy
+    bringup: true
     recipe: engine/engine_lint
     properties:
       cpu: arm64
@@ -431,6 +451,7 @@ targets:
       - "**.mm"
 
   - name: Mac iOS clang-tidy
+    bringup: true
     recipe: engine/engine_lint
     properties:
       cpu: arm64

From 32faf7e26b053382fae665eae0a5f4e1996cca91 Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Tue, 16 May 2023 16:03:14 -0700
Subject: [PATCH 2/2] Fix merge conflicts

---
 .ci.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 92aa35cb14f84..93a818c96f287 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -392,13 +392,6 @@ targets:
     drone_dimensions:
       - os=Linux
 
-  - name: Mac mac_clang_tidy
-    bringup: true
-    recipe: engine_v2/engine_v2
-    timeout: 60
-    properties:
-      config_name: mac_clang_tidy
-
   - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
     timeout: 60