forked from espressif/esp-protocols
Merge pull request #560 from david-cermak/fix/ci_build_v5.3
Fix CI build per IDFv5.3
This commit is contained in:
@ -13,9 +13,13 @@ jobs:
|
|||||||
name: Build
|
name: Build
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
idf_ver: ["latest", "release-v5.0"]
|
idf_ver: ["latest", "release-v5.1", "release-v5.0"]
|
||||||
idf_target: ["esp32"]
|
idf_target: ["esp32"]
|
||||||
test: [ { app: ifconfig-basic, path: "components/console_cmd_ifconfig/examples"}]
|
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
|
runs-on: ubuntu-22.04
|
||||||
container: espressif/idf:${{ matrix.idf_ver }}
|
container: espressif/idf:${{ matrix.idf_ver }}
|
||||||
steps:
|
steps:
|
||||||
@ -24,6 +28,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
|
- name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
|
||||||
|
env:
|
||||||
|
EXPECTED_WARNING: ${{ matrix.warning }}
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: ${{matrix.test.path}}
|
working-directory: ${{matrix.test.path}}
|
||||||
run: |
|
run: |
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
# The following four lines of boilerplate have to be in your project's CMakeLists
|
# The following four lines of boilerplate have to be in your project's CMakeLists
|
||||||
# in this exact order for cmake to work correctly
|
# in this exact order for cmake to work correctly
|
||||||
cmake_minimum_required(VERSION 3.16)
|
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)
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
|
espressif/iperf-cmd: "^0.1.1"
|
||||||
espressif/eppp_link:
|
espressif/eppp_link:
|
||||||
version: "*"
|
version: "*"
|
||||||
override_path: "../../.."
|
override_path: "../../.."
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
components/esp_modem/examples/ap_to_pppos:
|
components/esp_modem/examples/ap_to_pppos:
|
||||||
disable:
|
disable:
|
||||||
- if: IDF_TARGET in ["esp32h2"]
|
- if: IDF_TARGET in ["esp32h2", "esp32p4"]
|
||||||
|
|
||||||
components/esp_modem/examples/modem_console:
|
components/esp_modem/examples/modem_console:
|
||||||
disable:
|
disable:
|
||||||
|
@ -2,9 +2,5 @@
|
|||||||
# CMakeLists in this exact order for cmake to work correctly
|
# CMakeLists in this exact order for cmake to work correctly
|
||||||
cmake_minimum_required(VERSION 3.5)
|
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)
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
project(pppd_test)
|
project(pppd_test)
|
||||||
|
@ -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"
|
@ -8,7 +8,6 @@
|
|||||||
#include "sdkconfig.h"
|
#include "sdkconfig.h"
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
#include "esp_console.h"
|
#include "esp_console.h"
|
||||||
#include "cmd_system.h"
|
|
||||||
|
|
||||||
void register_pppd(void);
|
void register_pppd(void);
|
||||||
|
|
||||||
@ -22,7 +21,6 @@ void app_main(void)
|
|||||||
ESP_ERROR_CHECK(esp_console_new_repl_uart(&uart_config, &repl_config, &repl));
|
ESP_ERROR_CHECK(esp_console_new_repl_uart(&uart_config, &repl_config, &repl));
|
||||||
|
|
||||||
/* Register commands */
|
/* Register commands */
|
||||||
register_system_common();
|
|
||||||
register_pppd();
|
register_pppd();
|
||||||
|
|
||||||
printf("\n =======================================================\n");
|
printf("\n =======================================================\n");
|
||||||
|
Reference in New Issue
Block a user