From 0898a37af78dc5f7bc96e605bbea7948fdbcc29f Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Wed, 23 Feb 2022 13:28:51 +0800
Subject: [PATCH] Add CI for bridge_zigbee app and switch app

---
 .gitlab-ci.yml                                   | 16 ++++++++++++++++
 .../esp_matter_bridge/esp_matter_bridge.cpp      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 284bba316..81ba6a5db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,9 @@ variables:
     - cd $ESP_MATTER_PATH/examples/zap_light
     - idf.py set-target esp32
     - idf.py build
+    - cd $ESP_MATTER_PATH/examples/switch
+    - idf.py set-target esp32
+    - idf.py build
     - cd $ESP_MATTER_PATH/examples/light
     - idf.py set-target esp32
     - idf.py build
@@ -52,6 +55,18 @@ variables:
     - idf.py set-target esp32
     - idf.py build
 
+.build_bridge_zigbee_app: &build_bridge_zigbee_app
+    - idf.py build
+    - cd $IDF_PATH
+    - git checkout b05b70c7f39a45b9bb8d09498b45edbe3b7bfc22
+    - git submodule update --init --recursive
+    - rm -rf $HOME/.espressif/python_env
+    - ./install.sh
+    - . ./export.sh
+    - cd $ESP_MATTER_PATH/examples/bridge_zigbee
+    - idf.py set-target esp32
+    - idf.py build
+
 build_esp_matter_examples:
     stage: build
     image: $CI_DOCKER_REGISTRY/esp32-ci-env:matter
@@ -66,6 +81,7 @@ build_esp_matter_examples:
         - *setup_idf
         - *setup_matter
         - *build_examples
+        - *build_bridge_zigbee_app
 
 build_all_examples:
     stage: build
diff --git a/components/esp_matter_bridge/esp_matter_bridge.cpp b/components/esp_matter_bridge/esp_matter_bridge.cpp
index f8dbd67d1..19330a0cb 100644
--- a/components/esp_matter_bridge/esp_matter_bridge.cpp
+++ b/components/esp_matter_bridge/esp_matter_bridge.cpp
@@ -25,7 +25,7 @@ esp_matter_bridge_device_t *esp_matter_bridge_create_device(esp_matter_node_t *n
 {
     esp_matter_bridge_device_t *dev = (esp_matter_bridge_device_t *)calloc(1, sizeof(esp_matter_bridge_device_t));
     dev->node = node;
-    dev->endpoint = esp_matter_endpoint_create_bridged_node(node, &bridged_node_config, ENDPOINT_MASK_DELETABLE);
+    dev->endpoint = esp_matter_endpoint_create_bridged_node(node, &bridged_node_config, ESP_MATTER_ENDPOINT_FLAG_DELETABLE);
     if (!(dev->endpoint)) {
         ESP_LOGE(TAG, "Could not create esp_matter endpoint for bridged device");
         free(dev);