From 6075f25f3b09d0e56adb62a7c75a58d02a01195e Mon Sep 17 00:00:00 2001 From: chendejin Date: Tue, 14 Oct 2025 15:20:32 +0800 Subject: [PATCH 1/2] examples/managed_componenet_light: update example with component v1.4.2 --- examples/managed_component_light/main/app_main.cpp | 6 +++--- examples/managed_component_light/main/idf_component.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/managed_component_light/main/app_main.cpp b/examples/managed_component_light/main/app_main.cpp index 4dc60a3a4..72dbe7600 100644 --- a/examples/managed_component_light/main/app_main.cpp +++ b/examples/managed_component_light/main/app_main.cpp @@ -164,13 +164,13 @@ extern "C" void app_main() extended_color_light::config_t light_config; light_config.on_off.on_off = DEFAULT_POWER; - //light_config.on_off_lighting.start_up_on_off = nullptr; + light_config.on_off_lighting.start_up_on_off = nullptr; light_config.level_control.current_level = DEFAULT_BRIGHTNESS; light_config.level_control.on_level = DEFAULT_BRIGHTNESS; - //light_config.level_control_lighting.start_up_current_level = DEFAULT_BRIGHTNESS; + light_config.level_control_lighting.start_up_current_level = DEFAULT_BRIGHTNESS; light_config.color_control.color_mode = (uint8_t)ColorControl::ColorMode::kColorTemperature; light_config.color_control.enhanced_color_mode = (uint8_t)ColorControl::ColorMode::kColorTemperature; - light_config.color_control.color_temperature.startup_color_temperature_mireds = nullptr; + light_config.color_control_color_temperature.startup_color_temperature_mireds = nullptr; // endpoint handles can be used to add/modify clusters. endpoint_t *endpoint = extended_color_light::create(node, &light_config, ENDPOINT_FLAG_NONE, light_handle); diff --git a/examples/managed_component_light/main/idf_component.yml b/examples/managed_component_light/main/idf_component.yml index cb86d323b..9ad5ea8a1 100644 --- a/examples/managed_component_light/main/idf_component.yml +++ b/examples/managed_component_light/main/idf_component.yml @@ -9,4 +9,4 @@ dependencies: espressif/led_strip: version: "^2.0.0" espressif/esp_matter: - version: "^1.4.0" + version: "~1.4.2" From db983762ba845fd26c1dc973352515e10c5814b5 Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Fri, 10 Oct 2025 15:19:54 +0800 Subject: [PATCH 2/2] CI: run all the pytest example builds with the same IDF version --- .gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68774e0fb..3912a9d76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -286,7 +286,7 @@ build_image: REPOS_PATH: "$CI_PROJECT_DIR/repos" IDF_CCACHE_ENABLE: 1 -build_esp_matter_examples_pytest_C6_idf_v5_1: +build_esp_matter_examples_pytest_C6: extends: - .build_examples_template artifacts: @@ -306,7 +306,7 @@ build_esp_matter_examples_pytest_C6_idf_v5_1: - pip install -r tools/ci/requirements-build.txt - python tools/ci/build_apps.py ./examples --pytest_c6 -build_esp_matter_examples_pytest_H2_idf_v5_1: +build_esp_matter_examples_pytest_H2: extends: - .build_examples_template artifacts: @@ -340,10 +340,10 @@ build_esp_matter_examples_pytest_H2_idf_v5_1: - python tools/ci/build_apps.py ./examples --pytest_h2 - | if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then - python tools/ci/memory_analyzer.py --chip esp32h2 --job_name "build_esp_matter_examples_pytest_H2_idf_v5_1" --ref_map_file light_mr_base.map --example "light" + python tools/ci/memory_analyzer.py --chip esp32h2 --job_name "build_esp_matter_examples_pytest_H2" --ref_map_file light_mr_base.map --example "light" fi -build_esp_matter_examples_pytest_C2_idf_v5_1: +build_esp_matter_examples_pytest_C2: extends: - .build_examples_template artifacts: @@ -367,7 +367,7 @@ build_esp_matter_examples_pytest_C2_idf_v5_1: - python tools/ci/build_apps.py ./examples --pytest_c2 - | if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then - python tools/ci/memory_analyzer.py --chip esp32c2 --job_name "build_esp_matter_examples_pytest_C2_idf_v5_1" --ref_map_file light_mr_base.map --example "light" + python tools/ci/memory_analyzer.py --chip esp32c2 --job_name "build_esp_matter_examples_pytest_C2" --ref_map_file light_mr_base.map --example "light" fi @@ -460,7 +460,7 @@ build_nopytest_remaining_examples_manual: parallel: 2 -build_esp_matter_examples_pytest_C3_idf_v4_4: +build_esp_matter_examples_idf_v4_4: extends: - .build_examples_template image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} @@ -480,7 +480,6 @@ build_esp_matter_examples_pytest_C3_idf_v4_4: - cd ${ESP_MATTER_PATH} # idf v4.4 requires jinja < 3.1 so lets install the dependencies for idf v4.4 - pip install -r requirements_idf_v4.4.txt - - pip install -r tools/ci/requirements-build.txt # hack the construct==2.10.54 to make it work with idf-v4.4, Python3.12 # imp is not present in Python3.12 so remove it - wget https://files.pythonhosted.org/packages/30/2f/e2e6bad1b80f744cf5c2a6d622e3dee698b43e6c040f980ae0ac0edd5e54/construct-2.10.54.tar.gz @@ -488,17 +487,42 @@ build_esp_matter_examples_pytest_C3_idf_v4_4: - sed -i 's/, imp$//g' construct-2.10.54/construct/core.py - python3 -m pip install ./construct-2.10.54 - rm -rf construct-2.10.54* - - python tools/ci/build_apps.py ./examples --pytest_c3 + - cd ${ESP_MATTER_PATH}/examples/light + - idf.py set-target esp32c3 + - idf.py build variables: IDF_CHECKOUT_REF: "v4.4.3" + +build_esp_matter_examples_pytest_C3: + extends: + - .build_examples_template + image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} + artifacts: + paths: + - "examples/**/build*/size.json" + - "examples/**/build*/build_log.txt" + - "examples/**/build*/*.map" + - "examples/**/build*/*.bin" + - "examples/**/build*/flasher_args.json" + - "examples/**/build*/config/sdkconfig.json" + - "examples/**/build*/bootloader/*.bin" + - "examples/**/build*/partition_table/*.bin" + when: always + expire_in: 4 days + script: + - cd ${ESP_MATTER_PATH} + - pip install -r tools/ci/requirements-build.txt + - python tools/ci/build_apps.py ./examples --pytest_c3 + + pytest_esp32c3_esp_matter_dut: stage: target_test image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF} rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push" needs: - - build_esp_matter_examples_pytest_C3_idf_v4_4 + - build_esp_matter_examples_pytest_C3 script: - cd ${ESP_MATTER_PATH} - rm -rf connectedhomeip/connectedhomeip @@ -506,8 +530,6 @@ pytest_esp32c3_esp_matter_dut: - pip install -r tools/ci/requirements-pytest.txt - pytest examples/ --target esp32c3 -m esp_matter_dut --junitxml=XUNIT_RESULT.xml tags: ["esp32c3", "esp_matter_dut"] - variables: - IDF_CHECKOUT_REF: "v4.4.3" pytest_esp32c6_esp_matter_dut: stage: target_test @@ -515,7 +537,7 @@ pytest_esp32c6_esp_matter_dut: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push" needs: - - build_esp_matter_examples_pytest_C6_idf_v5_1 + - build_esp_matter_examples_pytest_C6 script: - cd ${ESP_MATTER_PATH} - rm -rf connectedhomeip/connectedhomeip @@ -540,7 +562,7 @@ pytest_esp32c2_esp_matter_dut: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push" needs: - - build_esp_matter_examples_pytest_C2_idf_v5_1 + - build_esp_matter_examples_pytest_C2 script: - cd ${ESP_MATTER_PATH} - rm -rf connectedhomeip/connectedhomeip @@ -559,7 +581,7 @@ pytest_esp32h2_esp_matter_dut: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push" needs: - - build_esp_matter_examples_pytest_H2_idf_v5_1 + - build_esp_matter_examples_pytest_H2 script: - cd ${ESP_MATTER_PATH} - rm -rf connectedhomeip/connectedhomeip