From 6ffb1f74e14a4836e3ef63e4c90fb7cc953d4197 Mon Sep 17 00:00:00 2001
From: Sebastian Muszynski <s.muszynski@constructiva.de>
Date: Wed, 17 Jan 2024 13:55:55 +0100
Subject: [PATCH 1/2] Fix lint-clang-tidy job

---
 .github/workflows/ci.yaml | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e609d08..27fab0c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -58,15 +58,23 @@ jobs:
     env:
       esphome_directory: esphome
     runs-on: ubuntu-latest
-    # cpp lint job runs with esphome-lint docker image so that clang-format-*
-    # doesn't have to be installed
-    container: esphome/esphome-lint:latest
     steps:
       - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.9-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.9-
 
-      - name: 💣 Clone esphome project
-        run: git clone https://github.com/esphome/esphome.git
-      - name: 💣 Copy component into the esphome project
+      - name: Clone esphome project
+        run: git clone https://github.com/esphome/esphome.git       -
+        name: Copy component into the esphome project
         run: |
           cp -r ../components/* esphome/components/
           git config user.name "ci"
@@ -75,6 +83,12 @@ jobs:
           git commit -a -m "Add external component"
         working-directory: ${{ env.esphome_directory }}
 
+      - name: Add missing requirements
+        run: pip3 install setuptools wheel
+      - name: Set up python environment
+        run: VIRTUAL_ENV=false script/setup
+        working-directory: ${{ env.esphome_directory }}
+
       # Set up the pio project so that the cpp checks know how files are compiled
       # (build flags, libraries etc)
       - name: Set up platformio environment

From a09bfb31e7adc25219e554c04c7b2fba5f7bb9df Mon Sep 17 00:00:00 2001
From: Sebastian Muszynski <s.muszynski@constructiva.de>
Date: Wed, 17 Jan 2024 13:58:40 +0100
Subject: [PATCH 2/2] Fix typo

---
 .github/workflows/ci.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 27fab0c..d12970e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -72,9 +72,9 @@ jobs:
           restore-keys: |
             esphome-pip-3.9-
 
-      - name: Clone esphome project
-        run: git clone https://github.com/esphome/esphome.git       -
-        name: Copy component into the esphome project
+      - name: 💣Clone esphome project
+        run: git clone https://github.com/esphome/esphome.git
+      - name: 💣Copy component into the esphome project
         run: |
           cp -r ../components/* esphome/components/
           git config user.name "ci"