Solving master merge conflicts

Author: vatsalghelani-csa

.github/.wordlist.txt

@@ -1006,6 +1006,7 @@ OpenThreadDemo
 openweave
 OperationalCredentials
 operationalDataset
+operationalstate
 opkg
 OPTIGA
 optionMask

.github/workflows/build.yaml

@@ -157,6 +157,9 @@ jobs:
               run: echo "$CONCURRENCY_CONTEXT"
             - name: Checkout
               uses: actions/checkout@v4
+              with:
+                  fetch-depth: 2
+                  persist-credentials: true
             - name: Try to ensure the directories for core dumping exist and we
                   can write them.
               run: |
@@ -186,6 +189,10 @@ jobs:
             - name: Clean output
               run: rm -rf ./out
             - name: Run Tests with sanitizers
+              # Sanitizer tests are not likely to find extra issues so running the same tests
+              # as above repeatedly on every pull request seems extra time. Instead keep this run
+              # for master only
+              if: github.event.pull_request.number == null
               env:
                   LSAN_OPTIONS: detect_leaks=1
               run: |
@@ -201,17 +208,34 @@ jobs:
                       BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --export-compile-commands
                       BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
                   done
+            - name: Generate tests with sanitizers (for tidy)
+              if: github.event.pull_request.number != null
+              run: |
+                  rm -rf ./out/sanitizers
+                  BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="is_clang=true is_asan=true chip_data_model_check_die_on_failure=true" --export-compile-commands
             - name: Ensure codegen is done for sanitize
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
+            - name: Find changed files
+              id: changed-files
+              uses: tj-actions/changed-files@v45
             - name: Clang-tidy validation
               # NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
               #       See https://github.com/llvm/llvm-project/issues/97426
+              env:
+                  ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
               run: |
+                  touch out/changed_files.txt
+                  for file in ${ALL_CHANGED_FILES}; do
+                      echo "$file changed and will be considered for tidy"
+                      echo "$file" >>out/changed_files.txt
+                  done
+
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \
                        --compile-database out/sanitizers/compile_commands.json \
                        --file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|-ReadImpl|-InvokeSubscribeImpl|CodegenDataModel_Write|QuieterReporting' \
+                       --file-list-file out/changed_files.txt \
                        check \
                     "
             - name: Clean output
@@ -382,6 +406,9 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v4
+              with:
+                  fetch-depth: 2
+                  persist-credentials: true
             - name: Checkout submodules & Bootstrap
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
@@ -409,7 +436,7 @@ jobs:
               env:
                   BUILD_TYPE: default
               run: |
-                  # We want to build various standalone example apps similar to what examples-linux-standalone.yaml
+                  # We want to build various standalone example apps (similar to what examples-linux-standalone.yaml
                   # does), so use target_os="all" to get those picked up as part of the "unified" build.  But then
                   # to save CI resources we want to exclude the "host clang" build, which uses the pigweed clang.
                   scripts/build/gn_gen.sh --args='target_os="all" is_asan=true enable_host_clang_build=false chip_data_model_check_die_on_failure=true' --export-compile-commands
@@ -418,14 +445,26 @@ jobs:
             - name: Ensure codegen is done for default
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
+            - name: Find changed files
+              id: changed-files
+              uses: tj-actions/changed-files@v45
             - name: Clang-tidy validation
               # NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
               #       See https://github.com/llvm/llvm-project/issues/97426
+              env:
+                  ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
               run: |
+                  touch out/changed_files.txt
+                  for file in ${ALL_CHANGED_FILES}; do
+                      echo "$file changed and will be considered for tidy"
+                      echo "$file" >>out/changed_files.txt
+                  done
+
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \
                        --compile-database out/default/compile_commands.json \
                        --file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|CodegenDataModel_Write|QuieterReporting' \
+                       --file-list-file out/changed_files.txt \
                        check \
                     "
             - name: Uploading diagnostic logs

.github/workflows/cancel_workflows_for_pr.yaml

@@ -0,0 +1,55 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Cancel workflow on PR
+on:
+    workflow_dispatch:
+      inputs:
+        pull_request_id:
+          description: 'PR number to consider'
+          required: true
+          type: number
+        commit_sha:
+          description: 'Cancel runs for this specific SHA'
+          required: true
+          type: string
+
+jobs:
+    cancel_workflow:
+        name: Report on pull requests
+
+        runs-on: ubuntu-latest
+
+        # Don't run on forked repos
+        if: github.repository_owner == 'project-chip'
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - uses: actions/setup-python@v5
+              with:
+                python-version: '3.12'
+            - name: Setup pip modules we use
+              run: |
+                  pip install     \
+                      click       \
+                      coloredlogs \
+                      pygithub    \
+                      && echo "DONE installint python prerequisites"
+            - name: Cancel runs
+              run: |
+                  scripts/tools/cancel_workflows_for_pr.py       \
+                    --pull-request ${{ inputs.pull_request_id }} \
+                    --commit-sha "${{ inputs.commit_sha }}"      \
+                    --gh-api-token "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/examples-bouffalolab.yaml

@@ -58,25 +58,15 @@ jobs:
         run: |
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
-              --target bouffalolab-bl602dk-light-easyflash \
-              --target bouffalolab-bl602dk-light-mfd-littlefs \
-              --target bouffalolab-bl602dk-light-rpc-115200-littlefs \
+              --target bouffalolab-bl602dk-light-mfd-littlefs-rpc-115200 \
               build \
               --copy-artifacts-to out/artifacts \
             "
       - name: Prepare some bloat report from the previous builds
         run: |
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl602 bl602 lighting-app \
-              out/artifacts/bouffalolab-bl602dk-light-easyflash/chip-bl602-lighting-example.out \
-              /tmp/bloat_reports/
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl602 bl602+mfd lighting-app \
-              out/artifacts/bouffalolab-bl602dk-light-mfd-littlefs/chip-bl602-lighting-example.out \
-              /tmp/bloat_reports/
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl602 bl602+rpc lighting-app \
-              out/artifacts/bouffalolab-bl602dk-light-rpc-115200-littlefs/chip-bl602-lighting-example.out \
+              bl602 bl602+mfd+littlefs+rpc lighting-app \
+              out/artifacts/bouffalolab-bl602dk-light-mfd-littlefs-rpc-115200/chip-bl602-lighting-example.out \
               /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
@@ -85,35 +75,25 @@ jobs:
         run: |
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
-              --target bouffalolab-bl706dk-light-easyflash \
-              --target bouffalolab-bl706dk-light-mfd-littlefs \
-              --target bouffalolab-bl706dk-light-ethernet-littlefs \
+              --target bouffalolab-bl706dk-light-ethernet-easyflash \
               --target bouffalolab-bl706dk-light-wifi-littlefs \
-              --target bouffalolab-bl706dk-light-rpc-115200-littlefs \
+              --target bouffalolab-bl706dk-light-mfd-rpc-littlefs-115200 \
               build \
               --copy-artifacts-to out/artifacts \
             "
       - name: Prepare some bloat report from the previous builds
         run: |
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl702 lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-easyflash/chip-bl702-lighting-example.out \
-              /tmp/bloat_reports/
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl702+mfd lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-mfd-littlefs/chip-bl702-lighting-example.out \
-              /tmp/bloat_reports/
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl706-eth lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-ethernet-littlefs/chip-bl702-lighting-example.out \
+              bl702 bl702+eth lighting-app \
+              out/artifacts/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl706-wifi lighting-app \
+              bl702 bl702+wifi lighting-app \
               out/artifacts/bouffalolab-bl706dk-light-wifi-littlefs/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl702+rpc lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-rpc-115200-littlefs/chip-bl702-lighting-example.out \
+              bl702 bl706+mfd+rpc+littlefs lighting-app \
+              out/artifacts/bouffalolab-bl706dk-light-mfd-rpc-littlefs-115200/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
@@ -123,19 +103,14 @@ jobs:
         run: |
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704ldk-light-easyflash \
               --target bouffalolab-bl704ldk-light-mfd-littlefs \
               build \
               --copy-artifacts-to out/artifacts \
             "
       - name: Prepare some bloat report from the previous builds
         run: |
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702l bl702l lighting-app \
-              out/artifacts/bouffalolab-bl704ldk-light-easyflash/chip-bl702l-lighting-example.out \
-              /tmp/bloat_reports/
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702l bl702l+mfd lighting-app \
+              bl702l bl702l+mfd+littlefs lighting-app \
               out/artifacts/bouffalolab-bl704ldk-light-mfd-littlefs/chip-bl702l-lighting-example.out \
               /tmp/bloat_reports/
       - name: Clean out build output
@@ -145,4 +120,4 @@ jobs:
         uses: ./.github/actions/upload-size-reports
         if: ${{ !env.ACT }}
         with:
-          platform-name: BouffaloLab
+          platform-name: BouffaloLab

.github/workflows/examples-esp32.yaml

@@ -105,14 +105,11 @@ jobs:
                      example_binaries/esp32-build/chip-all-clusters-app.elf \
                      /tmp/bloat_reports/
 
-            - name: Build example Pigweed App
-              run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
-
             - name: Build example Lighting App (Target:ESP32H2)
               run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
 
-            - name: Build example Lock App (Target:ESP32C6)
-              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
+            - name: Build example Lighting App (Target:ESP32C6)
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32c6 esp32c6
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
@@ -124,7 +121,7 @@ jobs:
         name: ESP32_1
 
         runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
+        if: github.actor != 'restyled-io[bot]' &&  github.repository_owner == 'espressif'
 
         container:
             image: ghcr.io/project-chip/chip-build-esp32:81
@@ -168,3 +165,9 @@ jobs:
 
             - name: Build example LIT ICD App (Target:ESP32H2)
               run: scripts/examples/esp_example.sh lit-icd-app sdkconfig.defaults esp32h2
+
+            - name: Build example Pigweed App
+              run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
+
+            - name: Build example Lock App (Target:ESP32C6)
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6

.github/workflows/qemu.yaml

@@ -38,7 +38,7 @@ jobs:
             BUILD_TYPE: esp32-qemu
 
         runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
+        if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'
 
         container:
             image: ghcr.io/project-chip/chip-build-esp32-qemu:81

.github/workflows/tests.yaml

@@ -210,6 +210,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml \
                     "
             - name: Build Apps
               run: |

config/esp32/components/chip/idf_component.yml

@@ -26,6 +26,14 @@ dependencies:
             - if: "idf_version >=5.0"
             - if: "target != esp32h2"
 
+    # This matches the dependency of esp_insights
+    espressif/esp_diag_data_store:
+        version: "1.0.1"
+        require: public
+        rules:
+            - if: "idf_version >=5.0"
+            - if: "target != esp32h2"
+
     espressif/esp_rcp_update:
         version: "1.2.0"
         rules: