From 6f05e3d20494d6cf5c9f7cd1a0b362e1491cdf7b Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Fri, 3 Apr 2026 11:54:44 +1000
Subject: [PATCH] [ci] Run ci-custom.py as a pre-commit check (#15411)

---
 .github/workflows/ci.yml | 2 +-
 .pre-commit-config.yaml  | 4 ++++
 script/run-in-env.py     | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71703652e8..06e8189f54 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -723,7 +723,7 @@ jobs:
           cache-key: ${{ needs.common.outputs.cache-key }}
       - uses: esphome/pre-commit-action@43cd1109c09c544d97196f7730ee5b2e0cc6d81e # v3.0.1 fork with pinned actions/cache
         env:
-          SKIP: pylint,clang-tidy-hash
+          SKIP: pylint,clang-tidy-hash,ci-custom
       - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
         if: always()
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4ff1685ea7..f8c21aad36 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -65,3 +65,7 @@ repos:
         files: ^(\.clang-tidy|platformio\.ini|requirements_dev\.txt)$
         pass_filenames: false
         additional_dependencies: []
+      - id: ci-custom
+        name: ci-custom
+        entry: python3 script/run-in-env.py script/ci-custom.py
+        language: system
diff --git a/script/run-in-env.py b/script/run-in-env.py
index 886e65db27..9283ba9940 100755
--- a/script/run-in-env.py
+++ b/script/run-in-env.py
@@ -44,7 +44,8 @@ def find_and_activate_virtualenv():
 def run_command():
     # Execute the remaining arguments in the new environment
     if len(sys.argv) > 1:
-        subprocess.run(sys.argv[1:], check=False, close_fds=False)
+        result = subprocess.run(sys.argv[1:], check=False, close_fds=False)
+        sys.exit(result.returncode)
     else:
         print(
             "No command provided to run in the virtual environment.",