Merge branch 'ci_disable_ext_platform' into 'main'

ci: disable external platform builds See merge request app-frameworks/esp-matter!581
espressif · Dec 20, 2023 · 03aa3db · 03aa3db
2 parents f5a314a + 22ac07f
commit 03aa3db
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -232,7 +232,10 @@ build_esp_matter_examples_non_pytest_idf_v5_1:
  variables:
  IDF_VERSION: "6b1f40b9bfb91ec82fab4a60e5bfb4ca0c9b062f"
  script:
- - *build_external_platform_example
+ # Disabling the external platform builds till we fix the build problem
+ # due to https://github.com/project-chip/connectedhomeip/pull/30531
+ # JIRA tracker: CON-942
+ # - *build_external_platform_example
  - *build_esp32c6_thread_example
 
  # mfg_test_app needs an secure boot signing key, generating one here

diff --git a/examples/.build-rules.yml b/examples/.build-rules.yml
@@ -1,8 +1,11 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
+# Disabling the external platform builds till we fix the build problem
+# due to https://github.com/project-chip/connectedhomeip/pull/30531
+# JIRA tracker: CON-942
 examples/blemesh_bridge:
  enable:
- - if: IDF_TARGET in ["esp32", "esp32c3"]
+ - if: IDF_TARGET in [""]
  temporary: true
  reason: the other targets are not tested yet
 

diff --git a/examples/esp-now_bridge_light/main/app_driver.cpp b/examples/esp-now_bridge_light/main/app_driver.cpp
@@ -323,7 +323,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
  cluster = cluster::get(endpoint, ColorControl::Id);
  attribute = attribute::get(cluster, ColorControl::Attributes::ColorMode::Id);
  attribute::get_val(attribute, &val);
- if (val.val.u8 == EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION) {
+ if (val.val.u8 == (uint8_t)ColorControl::ColorMode::kCurrentHueAndCurrentSaturation) {
  /* Setting hue */
  attribute = attribute::get(cluster, ColorControl::Attributes::CurrentHue::Id);
  attribute::get_val(attribute, &val);
@@ -332,7 +332,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
  attribute = attribute::get(cluster, ColorControl::Attributes::CurrentSaturation::Id);
  attribute::get_val(attribute, &val);
  err |= app_driver_light_set_saturation(handle, &val);
- } else if (val.val.u8 == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) {
+ } else if (val.val.u8 == (uint8_t)ColorControl::ColorMode::kColorTemperature) {
  /* Setting temperature */
  attribute = attribute::get(cluster, ColorControl::Attributes::ColorTemperatureMireds::Id);
  attribute::get_val(attribute, &val);

diff --git a/examples/esp-now_bridge_light/main/app_main.cpp b/examples/esp-now_bridge_light/main/app_main.cpp
@@ -115,8 +115,8 @@ extern "C" void app_main()
  light_config.on_off.lighting.start_up_on_off = nullptr;
  light_config.level_control.current_level = DEFAULT_BRIGHTNESS;
  light_config.level_control.lighting.start_up_current_level = DEFAULT_BRIGHTNESS;
- light_config.color_control.color_mode = EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE;
- light_config.color_control.enhanced_color_mode = EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE;
+ 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;
  endpoint_t *endpoint = color_temperature_light::create(node, &light_config, ENDPOINT_FLAG_NONE, light_handle);
  if (!endpoint) {

diff --git a/examples/zap_light/CMakeLists.txt b/examples/zap_light/CMakeLists.txt
@@ -73,3 +73,6 @@ idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_FAN_CONTROL_CLUSTER_SERVE
 idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND)
diff --git a/examples/zap_light/main/app_driver.cpp b/examples/zap_light/main/app_driver.cpp
@@ -119,7 +119,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
  cluster_id = ColorControl::Id;
  attribute_id = ColorControl::Attributes::CurrentHue::Id;
  attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, &value, sizeof(uint8_t));
- if (value == EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION) {
+ if (value == (uint8_t)ColorControl::ColorMode::kCurrentHueAndCurrentSaturation) {
  /* Setting hue */
  attribute_id = ColorControl::Attributes::CurrentHue::Id;
  attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, &value, sizeof(uint8_t));
@@ -130,7 +130,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
  attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, &value, sizeof(uint8_t));
  val = esp_matter_uint8(value);
  err |= app_driver_light_set_saturation(handle, &val);
- } else if (value == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) {
+ } else if (value == (uint8_t)ColorControl::ColorMode::kColorTemperature) {
  /* Setting temperature */
  attribute_id = ColorControl::Attributes::ColorTemperatureMireds::Id;
  attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value_u16, sizeof(uint16_t));