From d0c17ef0d52adbb6f9dec2f108294719197e10f5 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Fri, 26 Apr 2024 11:25:30 +0200 Subject: [PATCH 1/3] fix(modem): Fix CI build per IDFv5.3 --- components/esp_modem/.build-test-rules.yml | 2 +- components/esp_modem/test/target_iperf/CMakeLists.txt | 4 ---- .../esp_modem/test/target_iperf/main/idf_component.yml | 6 ++++++ .../esp_modem/test/target_iperf/main/pppd_iperf_main.c | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 components/esp_modem/test/target_iperf/main/idf_component.yml diff --git a/components/esp_modem/.build-test-rules.yml b/components/esp_modem/.build-test-rules.yml index a757003a2b..08190d20fe 100644 --- a/components/esp_modem/.build-test-rules.yml +++ b/components/esp_modem/.build-test-rules.yml @@ -1,6 +1,6 @@ components/esp_modem/examples/ap_to_pppos: disable: - - if: IDF_TARGET in ["esp32h2"] + - if: IDF_TARGET in ["esp32h2", "esp32p4"] components/esp_modem/examples/modem_console: disable: diff --git a/components/esp_modem/test/target_iperf/CMakeLists.txt b/components/esp_modem/test/target_iperf/CMakeLists.txt index ab61aaaa6a..3c1ea7ed30 100644 --- a/components/esp_modem/test/target_iperf/CMakeLists.txt +++ b/components/esp_modem/test/target_iperf/CMakeLists.txt @@ -2,9 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components - $ENV{IDF_PATH}/examples/common_components/iperf - "../..") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(pppd_test) diff --git a/components/esp_modem/test/target_iperf/main/idf_component.yml b/components/esp_modem/test/target_iperf/main/idf_component.yml new file mode 100644 index 0000000000..7f6af031d7 --- /dev/null +++ b/components/esp_modem/test/target_iperf/main/idf_component.yml @@ -0,0 +1,6 @@ +## IDF Component Manager Manifest File +dependencies: + espressif/esp_modem: + version: "^1.1.0" + override_path: "../../.." + espressif/iperf-cmd: "^0.1.1" diff --git a/components/esp_modem/test/target_iperf/main/pppd_iperf_main.c b/components/esp_modem/test/target_iperf/main/pppd_iperf_main.c index d8c69f4f9e..c8a80f07e5 100644 --- a/components/esp_modem/test/target_iperf/main/pppd_iperf_main.c +++ b/components/esp_modem/test/target_iperf/main/pppd_iperf_main.c @@ -8,7 +8,6 @@ #include "sdkconfig.h" #include "esp_log.h" #include "esp_console.h" -#include "cmd_system.h" void register_pppd(void); @@ -22,7 +21,6 @@ void app_main(void) ESP_ERROR_CHECK(esp_console_new_repl_uart(&uart_config, &repl_config, &repl)); /* Register commands */ - register_system_common(); register_pppd(); printf("\n =======================================================\n"); From bd6b66d9d1c3b28a96c7b7e323e8b8ff6d74b414 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Fri, 26 Apr 2024 11:32:46 +0200 Subject: [PATCH 2/3] fix(eppp): Example to use iperf component from the registry --- components/eppp_link/examples/host/CMakeLists.txt | 1 - components/eppp_link/examples/host/main/idf_component.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eppp_link/examples/host/CMakeLists.txt b/components/eppp_link/examples/host/CMakeLists.txt index 3405abc526..ba8427665b 100644 --- a/components/eppp_link/examples/host/CMakeLists.txt +++ b/components/eppp_link/examples/host/CMakeLists.txt @@ -1,7 +1,6 @@ # The following four lines of boilerplate have to be in your project's CMakeLists # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/iperf) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/eppp_link/examples/host/main/idf_component.yml b/components/eppp_link/examples/host/main/idf_component.yml index 675c135995..eeaef0415d 100644 --- a/components/eppp_link/examples/host/main/idf_component.yml +++ b/components/eppp_link/examples/host/main/idf_component.yml @@ -1,4 +1,5 @@ dependencies: + espressif/iperf-cmd: "^0.1.1" espressif/eppp_link: version: "*" override_path: "../../.." From 5df46437f2116c1d41b9c78901b17892badd20db Mon Sep 17 00:00:00 2001 From: David Cermak Date: Fri, 26 Apr 2024 11:57:06 +0200 Subject: [PATCH 3/3] fix(console): Ignore eth_init hidden config warning --- .github/workflows/console_cmd_ifconfig__build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/console_cmd_ifconfig__build.yml b/.github/workflows/console_cmd_ifconfig__build.yml index cc0d418897..fa56cf9489 100644 --- a/.github/workflows/console_cmd_ifconfig__build.yml +++ b/.github/workflows/console_cmd_ifconfig__build.yml @@ -13,9 +13,13 @@ jobs: name: Build strategy: matrix: - idf_ver: ["latest", "release-v5.0"] + idf_ver: ["latest", "release-v5.1", "release-v5.0"] idf_target: ["esp32"] test: [ { app: ifconfig-basic, path: "components/console_cmd_ifconfig/examples"}] + include: + - idf_ver: "latest" + warning: "the choice symbol ETHERNET_PHY_LAN867X" + runs-on: ubuntu-22.04 container: espressif/idf:${{ matrix.idf_ver }} steps: @@ -24,6 +28,8 @@ jobs: with: submodules: recursive - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }} + env: + EXPECTED_WARNING: ${{ matrix.warning }} shell: bash working-directory: ${{matrix.test.path}} run: |