From 96bfd024a17477c2a95fba24034a4e649530bbc4 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Thu, 31 Oct 2024 13:18:47 -0500
Subject: [PATCH] Remove version spec from IDF tests

---
 .clang-tidy                                       | 15 ++++++++++++++-
 platformio.ini                                    |  2 +-
 script/clang-tidy                                 | 12 +++++++-----
 .../build_components_base.esp32-c3-idf.yaml       |  2 --
 .../build_components_base.esp32-idf.yaml          |  2 --
 .../build_components_base.esp32-s2-idf.yaml       |  2 --
 .../build_components_base.esp32-s3-idf.yaml       |  2 --
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 946f2950d8..867ad23f1a 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -85,8 +85,21 @@ Checks: >-
   -readability-redundant-string-init,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
+  -cppcoreguidelines-avoid-const-or-ref-data-members,
+  -cppcoreguidelines-macro-to-enum,
+  -cppcoreguidelines-use-default-member-init,
+  -misc-const-correctness,
+  -misc-include-cleaner,
+  -misc-use-anonymous-namespace,
+  -modernize-macro-to-enum,
+  -modernize-type-traits,
+  -modernize-use-constraints,
+  -performance-enum-size,
+  -readability-avoid-nested-conditional-operator,
+  -readability-container-contains,
+  -readability-redundant-inline-specifier,
+  -readability-redundant-member-init,
 WarningsAsErrors: '*'
-AnalyzeTemporaryDtors: false
 FormatStyle:     google
 CheckOptions:
   - key:             google-readability-function-size.StatementThreshold
diff --git a/platformio.ini b/platformio.ini
index 9a6af782ee..b9b80e933f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -139,7 +139,7 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 extends = common:idf
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.06/platform-espressif32.zip
 platform_packages =
-    pioarduino/framework-espidf@https://github.com/pioarduino/esp-idf/releases/download/v5.1.4.241024/esp-idf-v5.1.4.zip
+    pioarduino/framework-espidf@https://github.com/pioarduino/esp-idf/releases/download/v5.1.5/esp-idf-v5.1.5.zip
 
 framework = espidf
 lib_deps =
diff --git a/script/clang-tidy b/script/clang-tidy
index 61199edce3..4e7d4721f9 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -64,7 +64,7 @@ def clang_options(idedata):
             # allow to condition code on the presence of clang-tidy
             "-DCLANG_TIDY",
             # (esp-idf) Disable this header because they use asm with registers clang-tidy doesn't know
-            "-D__XTENSA_API_H__",
+            # "-D__XTENSA_API_H__",
             # (esp-idf) Fix __once_callable in some libstdc++ headers
             "-D_GLIBCXX_HAVE_TLS",
         ]
@@ -101,9 +101,11 @@ def clang_options(idedata):
     for directory in list(idedata["includes"]["build"]):
         # skip our own directories, we add those later
         if (
-            not directory.startswith(f"{root_path}/")
-            or directory.startswith(f"{root_path}/.pio/")
-            or directory.startswith(f"{root_path}/managed_components/")
+            not directory.startswith(f"{root_path}")
+            or directory.startswith(f"{root_path}/.pio")
+            or directory.startswith(f"{root_path}/.platformio")
+            or directory.startswith(f"{root_path}/.temp")
+            or directory.startswith(f"{root_path}/managed_components")
         ):
             cmd.extend(["-isystem", directory])
 
@@ -235,7 +237,7 @@ def main():
 
     failed_files = []
     try:
-        executable = get_binary("clang-tidy", 14)
+        executable = get_binary("clang-tidy", 18)
         task_queue = queue.Queue(args.jobs)
         lock = threading.Lock()
         for _ in range(args.jobs):
diff --git a/tests/test_build_components/build_components_base.esp32-c3-idf.yaml b/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
index 72788a6f0f..18584497f4 100644
--- a/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
@@ -6,8 +6,6 @@ esp32:
   board: lolin_c3_mini
   framework:
     type: esp-idf
-    version: 5.1.4
-    release: "241024"
 
 logger:
   level: VERY_VERBOSE
diff --git a/tests/test_build_components/build_components_base.esp32-idf.yaml b/tests/test_build_components/build_components_base.esp32-idf.yaml
index 0c574046a9..a62a995e68 100644
--- a/tests/test_build_components/build_components_base.esp32-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-idf.yaml
@@ -6,8 +6,6 @@ esp32:
   board: nodemcu-32s
   framework:
     type: esp-idf
-    version: 5.1.4
-    release: "241024"
 
 logger:
   level: VERY_VERBOSE
diff --git a/tests/test_build_components/build_components_base.esp32-s2-idf.yaml b/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
index 37d0da56be..484906e8df 100644
--- a/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
@@ -7,8 +7,6 @@ esp32:
   variant: ESP32S2
   framework:
     type: esp-idf
-    version: 5.1.4
-    release: "241024"
 
 logger:
   level: VERY_VERBOSE
diff --git a/tests/test_build_components/build_components_base.esp32-s3-idf.yaml b/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
index 389176c8f1..ee209000e9 100644
--- a/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
@@ -7,8 +7,6 @@ esp32:
   variant: ESP32S3
   framework:
     type: esp-idf
-    version: 5.1.4
-    release: "241024"
 
 logger:
   level: VERY_VERBOSE