Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI build per IDFv5.3 #560

Merged
merged 3 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/console_cmd_ifconfig__build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion components/eppp_link/examples/host/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 1 addition & 0 deletions components/eppp_link/examples/host/main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dependencies:
espressif/iperf-cmd: "^0.1.1"
espressif/eppp_link:
version: "*"
override_path: "../../.."
Expand Down
2 changes: 1 addition & 1 deletion components/esp_modem/.build-test-rules.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 0 additions & 4 deletions components/esp_modem/test/target_iperf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 6 additions & 0 deletions components/esp_modem/test/target_iperf/main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 0 additions & 2 deletions components/esp_modem/test/target_iperf/main/pppd_iperf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "sdkconfig.h"
#include "esp_log.h"
#include "esp_console.h"
#include "cmd_system.h"

void register_pppd(void);

Expand All @@ -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");
Expand Down
Loading