From d8a46c74823ee842bfb9b1c3fa72f29b7ed13815 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 1 Aug 2025 21:40:53 +1200
Subject: [PATCH 1/4] [CI] Allow multiple grep options for clang-tidy (#10004)

---
 .github/workflows/ci.yml | 2 +-
 script/clang-tidy        | 7 ++++++-
 script/helpers.py        | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3f290c43f..992918a035 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -281,7 +281,7 @@ jobs:
             pio_cache_key: tidyesp32-idf
           - id: clang-tidy
             name: Run script/clang-tidy for ZEPHYR
-            options: --environment nrf52-tidy --grep USE_ZEPHYR
+            options: --environment nrf52-tidy --grep USE_ZEPHYR --grep USE_NRF52
             pio_cache_key: tidy-zephyr
             ignore_errors: false
 
diff --git a/script/clang-tidy b/script/clang-tidy
index 9576b8da8b..2c4a2e36ac 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -205,7 +205,12 @@ def main():
     parser.add_argument(
         "-c", "--changed", action="store_true", help="only run on changed files"
     )
-    parser.add_argument("-g", "--grep", help="only run on files containing value")
+    parser.add_argument(
+        "-g",
+        "--grep",
+        action="append",
+        help="only run on files containing value",
+    )
     parser.add_argument(
         "--split-num", type=int, help="split the files into X jobs.", default=None
     )
diff --git a/script/helpers.py b/script/helpers.py
index 4903521e2d..b346f3a461 100644
--- a/script/helpers.py
+++ b/script/helpers.py
@@ -338,12 +338,12 @@ def filter_changed(files: list[str]) -> list[str]:
     return files
 
 
-def filter_grep(files: list[str], value: str) -> list[str]:
+def filter_grep(files: list[str], value: list[str]) -> list[str]:
     matched = []
     for file in files:
         with open(file, encoding="utf-8") as handle:
             contents = handle.read()
-        if value in contents:
+        if any(v in contents for v in value):
             matched.append(file)
     return matched
 

From b5f42bc493461464b0ac94668f01dcf7ef04d2ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 09:53:56 -1000
Subject: [PATCH 2/4] Bump aioesphomeapi from 37.2.1 to 37.2.2 (#10009)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index b7d259f0c5..0d39e9edcf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 esptool==4.9.0
 click==8.1.7
 esphome-dashboard==20250514.0
-aioesphomeapi==37.2.1
+aioesphomeapi==37.2.2
 zeroconf==0.147.0
 puremagic==1.30
 ruamel.yaml==0.18.14 # dashboard_import

From 1f7c59f88d94acc26f36fe42ca5faba92fa430e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 10:02:29 -1000
Subject: [PATCH 3/4] Bump esptool from 4.9.0 to 5.0.2 (#9983)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0d39e9edcf..b834fd9ac3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ tzlocal==5.3.1    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
-esptool==4.9.0
+esptool==5.0.2
 click==8.1.7
 esphome-dashboard==20250514.0
 aioesphomeapi==37.2.2

From f1877ca084fbc2a13a18f9c41407a43dfe175a54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 20:16:28 +0000
Subject: [PATCH 4/4] Bump aioesphomeapi from 37.2.2 to 37.2.3 (#10012)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index b834fd9ac3..bfdb08323e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 esptool==5.0.2
 click==8.1.7
 esphome-dashboard==20250514.0
-aioesphomeapi==37.2.2
+aioesphomeapi==37.2.3
 zeroconf==0.147.0
 puremagic==1.30
 ruamel.yaml==0.18.14 # dashboard_import