From 04d5133114e77593a4ff0dc2455cdc96f8b2a490 Mon Sep 17 00:00:00 2001 From: xuxin Date: Tue, 1 Jul 2025 11:25:26 +0800 Subject: [PATCH] fix(ci): update build script for latest release v5.5 --- .gitlab/ci/build.yml | 22 +++++++++---------- components/bsp/src/boards/esp32_bsp_board.c | 1 + .../main/idf_component.yml | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 146c2dd..5708121 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -67,7 +67,7 @@ build_example_chatgpt_demo: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/chatgpt_demo NVS_DIR: examples/chatgpt_demo/factory_nvs @@ -87,7 +87,7 @@ build_example_chatgpt_demo_factory_nvs: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/chatgpt_demo/factory_nvs @@ -102,7 +102,7 @@ build_example_factory_demo: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/factory_demo @@ -117,7 +117,7 @@ build_example_image_display: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/image_display @@ -132,7 +132,7 @@ build_example_lv_demos: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/lv_demos @@ -147,7 +147,7 @@ build_example_mp3_demo: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/mp3_demo @@ -160,9 +160,9 @@ build_example_usb_camera_lcd_display: - IMAGE: espressif/idf:release-v5.0 - IMAGE: espressif/idf:release-v5.1 - IMAGE: espressif/idf:release-v5.2 - - IMAGE: espressif/idf:release-v5.3 + # - IMAGE: espressif/idf:release-v5.3 don't support release-v5.3 now. - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + # - IMAGE: espressif/idf:latest usb_stream do not support release-v5.5 variables: EXAMPLE_DIR: examples/usb_camera_lcd_display @@ -176,7 +176,7 @@ build_example_esp_joystick: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + # - IMAGE: espressif/idf:release-v5.5 esp_now do not support release-v5.5 variables: EXAMPLE_DIR: examples/esp_joystick @@ -191,7 +191,7 @@ build_example_usb_headset: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/usb_headset @@ -206,6 +206,6 @@ build_example_watering_demo: - IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.3 - IMAGE: espressif/idf:release-v5.4 - - IMAGE: espressif/idf:latest + - IMAGE: espressif/idf:release-v5.5 variables: EXAMPLE_DIR: examples/watering_demo diff --git a/components/bsp/src/boards/esp32_bsp_board.c b/components/bsp/src/boards/esp32_bsp_board.c index 40e0745..81ac6b2 100644 --- a/components/bsp/src/boards/esp32_bsp_board.c +++ b/components/bsp/src/boards/esp32_bsp_board.c @@ -89,6 +89,7 @@ esp_err_t bsp_btn_init(void) int btn_num = 0; g_btn_handle = calloc(BSP_BUTTON_NUM, sizeof(button_handle_t)); assert((g_btn_handle) && "memory is insufficient for button"); + esp_log_level_set("button", ESP_LOG_NONE); return bsp_iot_button_create(g_btn_handle, &btn_num, BSP_BUTTON_NUM); } diff --git a/examples/usb_camera_lcd_display/main/idf_component.yml b/examples/usb_camera_lcd_display/main/idf_component.yml index fa60c03..4b1121c 100644 --- a/examples/usb_camera_lcd_display/main/idf_component.yml +++ b/examples/usb_camera_lcd_display/main/idf_component.yml @@ -1,4 +1,4 @@ dependencies: idf: ">=5.0" usb_stream: - version: "~1.3.*" + version: "~1.5.*"