Skip to content

Commit 7c133a8

Browse files
committed
Merge branch 'fix/copy_components_for_usb_examples_before_upload' into 'master'
fix(cdc): copy components for examples before upload See merge request ae_group/esp-iot-solution!1455
2 parents 4559d54 + 1209cd7 commit 7c133a8

File tree

33 files changed

+25
-10
lines changed

33 files changed

+25
-10
lines changed

.github/workflows/upload_component.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ jobs:
2424
cp -r examples/display/gui/common/hw_init examples/display/gui/lvgl_freetype_font/components/
2525
mkdir -p examples/display/gui/lvgl_light_sleep_demo/components/
2626
cp -r examples/display/gui/common/hw_init examples/display/gui/lvgl_light_sleep_demo/components/
27+
mkdir -p examples/usb/host/usb_cdc_4g_module/components/
28+
cp -r examples/common_components/web_wifi examples/common_components/network_test examples/usb/host/usb_cdc_4g_module/components/
29+
mkdir -p examples/usb/host/usb_ecm_4g_module/components/
30+
cp -r examples/common_components/web_wifi examples/common_components/network_test examples/usb/host/usb_ecm_4g_module/components/
31+
mkdir -p examples/usb/host/usb_rndis_4g_module/components/
32+
cp -r examples/common_components/web_wifi examples/common_components/network_test examples/usb/host/usb_rndis_4g_module/components/
2733
- name: Upload components to component service
2834
uses: espressif/upload-components-ci-action@v1
2935
with:

.gitlab/ci/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,10 +1563,7 @@ build_components_iot_eth_test_apps:
15631563
extends:
15641564
- .build_examples_template
15651565
- .rules:build:components_iot_eth_test
1566-
parallel:
1567-
matrix:
1568-
- IMAGE: espressif/idf:release-v4.4
1569-
- IMAGE: espressif/idf:release-v5.5
1566+
- .build_idf_active_release_version
15701567
variables:
15711568
EXAMPLE_DIR: components/iot_eth/test_apps
15721569

examples/.build-rules.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ examples/bluetooth/ble_services/ble_wss:
8585
examples/bluetooth/ble_ota:
8686
enable:
8787
- if: SOC_BLE_SUPPORTED == 1
88+
disable:
89+
- if: IDF_TARGET in ["esp32c5"]
90+
temporary: true
91+
reason: "The ble_ota component does not currently support ESP32C5."
8892

8993
examples/bluetooth/ble_remote_control:
9094
enable:

examples/usb/host/usb_cdc_4g_module/components/network_test/CMakeLists.txt renamed to examples/common_components/network_test/CMakeLists.txt

File renamed without changes.

examples/usb/host/usb_cdc_4g_module/components/network_test/network_test.c renamed to examples/common_components/network_test/network_test.c

File renamed without changes.

examples/usb/host/usb_cdc_4g_module/components/network_test/network_test.h renamed to examples/common_components/network_test/network_test.h

File renamed without changes.

examples/usb/host/usb_cdc_4g_module/components/app_wifi/CMakeLists.txt renamed to examples/common_components/web_wifi/CMakeLists.txt

File renamed without changes.

examples/usb/host/usb_cdc_4g_module/components/app_wifi/Kconfig.projbuild renamed to examples/common_components/web_wifi/Kconfig.projbuild

File renamed without changes.

examples/usb/host/usb_cdc_4g_module/components/app_wifi/app_wifi.c renamed to examples/common_components/web_wifi/app_wifi.c

File renamed without changes.

examples/usb/host/usb_cdc_4g_module/components/app_wifi/idf_component.yml renamed to examples/common_components/web_wifi/idf_component.yml

File renamed without changes.

0 commit comments

Comments
 (0)