Merge pull request #605 from gabsuren/ci/websocket_host_fix

CI: fix
espressif · Jul 19, 2024 · cb1bc41 · cb1bc41
2 parents 906e447 + 8d91f5f
commit cb1bc41
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>

diff --git 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
@@ -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/...bsocket_client/examples/linux/main/main.c → ...ent/examples/linux/main/websocket_linux.c b/...bsocket_client/examples/linux/main/main.c → ...ent/examples/linux/main/websocket_linux.c
@@ -3,20 +3,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <stdio.h>
-#include "esp_log.h"
+#include <esp_log.h>
 #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";