From eab58de6300b3d100104b035972bef6ce2ac1ede Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Tue, 28 May 2024 14:40:46 +0200
Subject: [PATCH] ci(common): Fix build jobs to install only idf-build-apps in
 idf container

---
 .github/workflows/console_cmd_ifconfig__build.yml | 2 +-
 .github/workflows/console_cmd_ping__build.yml     | 2 +-
 .github/workflows/console_cmd_wifi__build.yml     | 2 +-
 .github/workflows/console_simple_init__build.yml  | 2 +-
 .github/workflows/mqtt_cxx__build.yml             | 2 +-
 .github/workflows/tls_cxx__build.yml              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/console_cmd_ifconfig__build.yml b/.github/workflows/console_cmd_ifconfig__build.yml
index e831dbc162..0db866921f 100644
--- a/.github/workflows/console_cmd_ifconfig__build.yml
+++ b/.github/workflows/console_cmd_ifconfig__build.yml
@@ -33,6 +33,6 @@ jobs:
         shell: bash
         working-directory: ${{matrix.test.path}}
         run: |
-          ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
+          pip install idf-component-manager idf-build-apps --upgrade
           python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/console_cmd_ping__build.yml b/.github/workflows/console_cmd_ping__build.yml
index 0f6c2cd9d6..cab31fe007 100644
--- a/.github/workflows/console_cmd_ping__build.yml
+++ b/.github/workflows/console_cmd_ping__build.yml
@@ -27,6 +27,6 @@ jobs:
         shell: bash
         working-directory: ${{matrix.test.path}}
         run: |
-          ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
+          pip install idf-component-manager idf-build-apps --upgrade
           python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/console_cmd_wifi__build.yml b/.github/workflows/console_cmd_wifi__build.yml
index b37ce0fa46..25c67e18f2 100644
--- a/.github/workflows/console_cmd_wifi__build.yml
+++ b/.github/workflows/console_cmd_wifi__build.yml
@@ -27,6 +27,6 @@ jobs:
         shell: bash
         working-directory: ${{matrix.test.path}}
         run: |
-          ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
+          pip install idf-component-manager idf-build-apps --upgrade
           python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/console_simple_init__build.yml b/.github/workflows/console_simple_init__build.yml
index 9f5e78001d..584f2396cb 100644
--- a/.github/workflows/console_simple_init__build.yml
+++ b/.github/workflows/console_simple_init__build.yml
@@ -27,6 +27,6 @@ jobs:
         shell: bash
         working-directory: ${{matrix.test.path}}
         run: |
-          ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
+          pip install idf-component-manager idf-build-apps --upgrade
           python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/mqtt_cxx__build.yml b/.github/workflows/mqtt_cxx__build.yml
index 64fc559db3..e99111c8dd 100644
--- a/.github/workflows/mqtt_cxx__build.yml
+++ b/.github/workflows/mqtt_cxx__build.yml
@@ -27,6 +27,6 @@ jobs:
         shell: bash
         working-directory: ${{matrix.test.path}}
         run: |
-          ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
+          pip install idf-component-manager idf-build-apps --upgrade
           python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/tls_cxx__build.yml b/.github/workflows/tls_cxx__build.yml
index 987aaa4900..974762e97b 100644
--- a/.github/workflows/tls_cxx__build.yml
+++ b/.github/workflows/tls_cxx__build.yml
@@ -25,6 +25,6 @@ jobs:
       - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
         shell: bash
         run: |
-          ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
+          pip install idf-component-manager idf-build-apps --upgrade
           python ./ci/build_apps.py ./components/mbedtls_cxx/${{ matrix.test.path }} -vv --preserve-all