Skip to content

Commit cb1bc41

Browse files
authored
Merge pull request #605 from gabsuren/ci/websocket_host_fix
CI: fix
2 parents 906e447 + 8d91f5f commit cb1bc41

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

.github/workflows/modem__target-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ jobs:
6969
- modem
7070
env:
7171
TEST_DIR: components/esp_modem/${{ matrix.test.path }}
72+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
7273
steps:
7374
- name: Clear repository
74-
run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
75+
run: |
76+
sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
7577
- uses: actions/checkout@v3
7678
- uses: actions/download-artifact@v3
7779
with:

common_components/linux_compat/freertos/include/freertos/FreeRTOS.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
#pragma once
77

8+
#include <stdio.h>
89
#include <stdint.h>
910
#include <stdbool.h>
1011
#include <stddef.h>

components/esp_websocket_client/examples/linux/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ set(common_component_dir ../../../../common_components)
66
set(EXTRA_COMPONENT_DIRS
77
../..
88
"${common_component_dir}/linux_compat/esp_timer"
9-
"${common_component_dir}/linux_compat"
109
"${common_component_dir}/linux_compat/freertos"
1110
$ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs
1211
$ENV{IDF_PATH}/examples/common_components/protocol_examples_common)

components/esp_websocket_client/examples/linux/main/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
idf_component_register(SRCS "main.c"
2-
INCLUDE_DIRS
3-
"."
1+
idf_component_register(SRCS "websocket_linux.c"
42
REQUIRES esp_websocket_client protocol_examples_common)
53

64
if(CONFIG_GCOV_ENABLED)

components/esp_websocket_client/examples/linux/main/main.c renamed to components/esp_websocket_client/examples/linux/main/websocket_linux.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include <stdio.h>
7-
#include "esp_log.h"
6+
#include <esp_log.h>
87
#include "nvs_flash.h"
98
#include "protocol_examples_common.h"
109

11-
#include "freertos/FreeRTOS.h"
12-
#include "freertos/task.h"
13-
#include "freertos/semphr.h"
14-
#include "freertos/event_groups.h"
15-
1610
#include "esp_websocket_client.h"
1711
#include "esp_system.h"
1812
#include "esp_event.h"
19-
#include "esp_log.h"
2013
#include "esp_netif.h"
2114

2215
static const char *TAG = "websocket";

0 commit comments

Comments
 (0)