diff --git a/.github/workflows/modem__target-test.yml b/.github/workflows/modem__target-test.yml index 050835a291..5681a5e05e 100644 --- a/.github/workflows/modem__target-test.yml +++ b/.github/workflows/modem__target-test.yml @@ -69,9 +69,11 @@ jobs: - modem env: TEST_DIR: components/esp_modem/${{ matrix.test.path }} + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true steps: - name: Clear repository - run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE + run: | + sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: diff --git a/common_components/linux_compat/freertos/include/freertos/FreeRTOS.h b/common_components/linux_compat/freertos/include/freertos/FreeRTOS.h index b8d553b74d..83b4fff0a2 100644 --- a/common_components/linux_compat/freertos/include/freertos/FreeRTOS.h +++ b/common_components/linux_compat/freertos/include/freertos/FreeRTOS.h @@ -5,6 +5,7 @@ */ #pragma once +#include #include #include #include diff --git a/components/esp_websocket_client/examples/linux/CMakeLists.txt b/components/esp_websocket_client/examples/linux/CMakeLists.txt index f09f10185c..16a759f7b0 100644 --- a/components/esp_websocket_client/examples/linux/CMakeLists.txt +++ b/components/esp_websocket_client/examples/linux/CMakeLists.txt @@ -6,7 +6,6 @@ set(common_component_dir ../../../../common_components) set(EXTRA_COMPONENT_DIRS ../.. "${common_component_dir}/linux_compat/esp_timer" - "${common_component_dir}/linux_compat" "${common_component_dir}/linux_compat/freertos" $ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) diff --git a/components/esp_websocket_client/examples/linux/main/CMakeLists.txt b/components/esp_websocket_client/examples/linux/main/CMakeLists.txt index 76c253a316..fb27de9d8f 100644 --- a/components/esp_websocket_client/examples/linux/main/CMakeLists.txt +++ b/components/esp_websocket_client/examples/linux/main/CMakeLists.txt @@ -1,6 +1,4 @@ -idf_component_register(SRCS "main.c" - INCLUDE_DIRS - "." +idf_component_register(SRCS "websocket_linux.c" REQUIRES esp_websocket_client protocol_examples_common) if(CONFIG_GCOV_ENABLED) diff --git a/components/esp_websocket_client/examples/linux/main/main.c b/components/esp_websocket_client/examples/linux/main/websocket_linux.c similarity index 96% rename from components/esp_websocket_client/examples/linux/main/main.c rename to components/esp_websocket_client/examples/linux/main/websocket_linux.c index 6356fd9c75..5650090537 100644 --- a/components/esp_websocket_client/examples/linux/main/main.c +++ b/components/esp_websocket_client/examples/linux/main/websocket_linux.c @@ -3,20 +3,13 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include -#include "esp_log.h" +#include #include "nvs_flash.h" #include "protocol_examples_common.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "freertos/semphr.h" -#include "freertos/event_groups.h" - #include "esp_websocket_client.h" #include "esp_system.h" #include "esp_event.h" -#include "esp_log.h" #include "esp_netif.h" static const char *TAG = "websocket";