Skip to content

Commit f6f6ded

Browse files
authored
Merge pull request #560 from david-cermak/fix/ci_build_v5.3
Fix CI build per IDFv5.3
2 parents 06d013b + 5df4643 commit f6f6ded

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

.github/workflows/console_cmd_ifconfig__build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ jobs:
1313
name: Build
1414
strategy:
1515
matrix:
16-
idf_ver: ["latest", "release-v5.0"]
16+
idf_ver: ["latest", "release-v5.1", "release-v5.0"]
1717
idf_target: ["esp32"]
1818
test: [ { app: ifconfig-basic, path: "components/console_cmd_ifconfig/examples"}]
19+
include:
20+
- idf_ver: "latest"
21+
warning: "the choice symbol ETHERNET_PHY_LAN867X"
22+
1923
runs-on: ubuntu-22.04
2024
container: espressif/idf:${{ matrix.idf_ver }}
2125
steps:
@@ -24,6 +28,8 @@ jobs:
2428
with:
2529
submodules: recursive
2630
- name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
31+
env:
32+
EXPECTED_WARNING: ${{ matrix.warning }}
2733
shell: bash
2834
working-directory: ${{matrix.test.path}}
2935
run: |

components/eppp_link/examples/host/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# The following four lines of boilerplate have to be in your project's CMakeLists
22
# in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.16)
4-
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/iperf)
54

65

76
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

components/eppp_link/examples/host/main/idf_component.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
dependencies:
2+
espressif/iperf-cmd: "^0.1.1"
23
espressif/eppp_link:
34
version: "*"
45
override_path: "../../.."

components/esp_modem/.build-test-rules.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
components/esp_modem/examples/ap_to_pppos:
22
disable:
3-
- if: IDF_TARGET in ["esp32h2"]
3+
- if: IDF_TARGET in ["esp32h2", "esp32p4"]
44

55
components/esp_modem/examples/modem_console:
66
disable:

components/esp_modem/test/target_iperf/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,5 @@
22
# CMakeLists in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components
6-
$ENV{IDF_PATH}/examples/common_components/iperf
7-
"../..")
8-
95
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
106
project(pppd_test)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## IDF Component Manager Manifest File
2+
dependencies:
3+
espressif/esp_modem:
4+
version: "^1.1.0"
5+
override_path: "../../.."
6+
espressif/iperf-cmd: "^0.1.1"

components/esp_modem/test/target_iperf/main/pppd_iperf_main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "sdkconfig.h"
99
#include "esp_log.h"
1010
#include "esp_console.h"
11-
#include "cmd_system.h"
1211

1312
void register_pppd(void);
1413

@@ -22,7 +21,6 @@ void app_main(void)
2221
ESP_ERROR_CHECK(esp_console_new_repl_uart(&uart_config, &repl_config, &repl));
2322

2423
/* Register commands */
25-
register_system_common();
2624
register_pppd();
2725

2826
printf("\n =======================================================\n");

0 commit comments

Comments
 (0)