Merge branch 'project-chip:master' into bugfix/soc_window_app_build_fix

.github/.wordlist.txt

@@ -154,6 +154,7 @@ blocklist
 blockquote
 bluetoothd
 bluez
+BOOL
 BooleanState
 bootable
 Bootloader
@@ -632,6 +633,7 @@ hci
 hciattach
 hciconfig
 hdlc
+HEPA
 HKDF
 HMAC
 hoc
@@ -641,7 +643,6 @@ HomePods
 hostapd
 hostname
 href
-HEPA
 HTTPS
 HW
 hwadr
@@ -652,6 +653,7 @@ IasWd
 iaszone
 ibb
 ICA
+ICD
 iCloud
 ICMP
 IDF

.github/actions/bootstrap/action.yaml

@@ -1,8 +1,13 @@
 name: Bootstrap
 description: Bootstrap
+inputs:
+  platform:
+    description: "Platform name"
+    required: false
+    default: none
 runs:
   using: "composite"
   steps:
     - name: Bootstrap
       shell: bash
-      run: bash scripts/bootstrap.sh
+      run: bash scripts/bootstrap.sh -p all,${{ inputs.platform }}

.github/actions/checkout-submodules-and-bootstrap/action.yaml

@@ -24,6 +24,8 @@ runs:
       uses: ./.github/actions/bootstrap-cache
     - name: Bootstrap
       uses: ./.github/actions/bootstrap
+      with:
+        platform: ${{ inputs.platform }}
     - name: Upload Bootstrap Logs
       uses: ./.github/actions/upload-bootstrap-logs
       with:

.github/issue-labeler.yml

@@ -1,8 +1,16 @@
 darwin:
-  - "(ios|homepod|darwin|mac|macos)"
+  # Make sure we don't match random words that contain "mac" inside.
+  #
+  # Make sure we don't match random words that contain "ios" inside
+  # (like "kiosk" or whatnot), but do allow matching "ios8" and things
+  # like that.
+  #
+  # \\b means "word boundary"
+  # (?![a-z]) means "there is no next char in the range a-z".
+  - "/(\\bios(?![a-z])|homepod|darwin|\\bmac\\b|macos)/i"
 
 linux:
-  - "(linux)"
+  - "/(linux)/i"
 
 # Special Keywords for Cert Blockers
 air purifiers:

.github/workflows/examples-ameba.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:1
+            image: ghcr.io/project-chip/chip-build-ameba:4
             options: --user root
 
         steps:

.github/workflows/examples-efr32.yaml

@@ -67,7 +67,7 @@ jobs:
              "./scripts/build/build_examples.py \
                 --enable-flashbundle \
                 --target efr32-brd4187c-thermostat-openthread_mtd \
-                --target efr32-brd4187c-switch-sed-shell-use_ot_coap_lib \
+                --target efr32-brd4187c-switch-shell-use_ot_coap_lib \
                 --target efr32-brd4187c-unit-test \
                 build \
                 --copy-artifacts-to out/artifacts \
@@ -81,7 +81,7 @@ jobs:
                 --enable-flashbundle \
                 --target efr32-brd4187c-light-use_ot_lib \
                 --target efr32-brd4187c-pump \
-                --target efr32-brd4187c-lock-rpc-shell-enable_heap_monitoring \
+                --target efr32-brd4187c-lock-shell-enable_heap_monitoring \
                 build \
                 --copy-artifacts-to out/artifacts \
              "

.github/workflows/examples-esp32.yaml

@@ -107,12 +107,15 @@ jobs:
                      esp32 c3devkit all-clusters-app \
                      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
-              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults
-            - name: Build example Lock App
-              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
+
+            - name: Build example Lighting App (Target:ESP32H2)
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2
+
+            - name: Build example Lock App (Target:ESP32C6)
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
@@ -156,3 +159,6 @@ jobs:
 
             - name: Build example OTA Provider App
               run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
+
+            - name: Build example Light Switch App (Target:ESP32C3)
+              run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3

.github/workflows/examples-k32w.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:1
+            image: ghcr.io/project-chip/chip-build-k32w:5
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.github/workflows/examples-openiotsdk.yaml

@@ -72,6 +72,15 @@ jobs:
                     examples/shell/openiotsdk/build/chip-openiotsdk-shell-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: shell example"
+              if: steps.build_shell.outcome == 'success'
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
+
+            - name: Clean shell output
+              run: rm -rf examples/shell/openiotsdk/build
+
             - name: Build lock-app example (mbedtls)
               # Disabled being tracked here: https://github.com/project-chip/connectedhomeip/issues/28026
               if: false
@@ -93,6 +102,18 @@ jobs:
                     examples/tv-app/openiotsdk/build/chip-openiotsdk-tv-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: tv-app example"
+              if: steps.build_tv_app.outcome == 'success'
+              timeout-minutes: 10
+              run: |
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
+
+            - name: Clean tv-app output
+              run: rm -rf examples/tv-app/openiotsdk/build
+
             - name: Build all-clusters-app example
               id: build_all_clusters_app
               timeout-minutes: 10
@@ -103,6 +124,18 @@ jobs:
                     examples/all-clusters-app/openiotsdk/build/chip-openiotsdk-all-clusters-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: all-clusters-app example"
+              if: steps.build_all_clusters_app.outcome == 'success'
+              timeout-minutes: 5
+              run: |
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
+
+            - name: Clean all-clusters-app output
+              run: rm -rf examples/all-clusters-app/openiotsdk/build
+
             - name: Build ota-requestor-app example
               id: build_ota_requestor_app
               timeout-minutes: 10
@@ -127,12 +160,6 @@ jobs:
               run: |
                   scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out/ota-provider chip_config_network_layer_ble=false
 
-            - name: "Test: shell example"
-              if: steps.build_shell.outcome == 'success'
-              run: |
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
-
             - name: "Test: lock-app example (mbedtls)"
               if: steps.build_lock_app_mbedtls.outcome == 'success'
               run: |
@@ -141,24 +168,6 @@ jobs:
                     'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
-            - name: "Test: tv-app example"
-              if: steps.build_tv_app.outcome == 'success'
-              timeout-minutes: 10
-              run: |
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
-
-            - name: "Test: all-clusters-app example"
-              if: steps.build_all_clusters_app.outcome == 'success'
-              timeout-minutes: 5
-              run: |
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
-
             - name: "Test: ota-requestor-app example"
               if: steps.build_ota_requestor_app.outcome == 'success' && steps.build_ota_provider_app.outcome == 'success'
               timeout-minutes: 30
@@ -189,11 +198,6 @@ jobs:
                     examples/lock-app/openiotsdk/build/chip-openiotsdk-lock-app-example.elf \
                     /tmp/bloat_reports/
 
-            - name: Build unit tests (psa)
-              id: build_unit_tests_psa
-              run: |
-                  scripts/examples/openiotsdk_example.sh -b psa unit-tests
-
             - name: "Test: lock-app example (psa)"
               if: steps.build_lock_app_psa.outcome == 'success'
               run: |
@@ -202,6 +206,11 @@ jobs:
                     'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
+            - name: Build unit tests (psa)
+              id: build_unit_tests_psa
+              run: |
+                  scripts/examples/openiotsdk_example.sh -b psa unit-tests
+
             - name: "Test: unit-tests (psa)"
               if: steps.build_unit_tests_psa.outcome == 'success'
               run: |

.github/workflows/minimal-build.yaml

@@ -36,10 +36,12 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v3
-            - name: Checkout submodules & Bootstrap
-              uses: ./.github/actions/checkout-submodules-and-bootstrap
+
+            - name: Checkout submodules # but don't bootstrap!
+              uses: ./.github/actions/checkout-submodules
               with:
                 platform: linux
+
             - name: Configure and build All Clusters App
               run: |
                   CC=gcc CXX=g++ scripts/configure --project=examples/all-clusters-app/linux && ./ninja-build

.github/workflows/recent_fail_summary.yaml

@@ -0,0 +1,39 @@
+# Copyright (c) 2020 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: Recent Fail Summary
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+concurrency:
+    group: ${{ github.workflow }}
+
+jobs:
+  list_workflows:
+    name: Summarize Recent Workflow Failures
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        run: |
+          gh run list -b master -s failure --json displayTitle,workflowName > runlist.json
+          pip install pandas
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Run Summarization Script
+        run: python scripts/tools/summarize_fail.py
+

.github/workflows/tests.yaml

@@ -427,7 +427,7 @@ jobs:
 
             - name: Build Python REPL and example apps
               run: |
-                  scripts/run_in_build_env.sh './scripts/build_python.sh --install_virtual_env out/venv --extra_packages "mobly"'
+                  scripts/run_in_build_env.sh './scripts/build_python.sh --install_virtual_env out/venv'
                   ./scripts/run_in_build_env.sh \
                    "./scripts/build/build_examples.py \
                       --target linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test \
@@ -455,6 +455,8 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCCLEANM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCRUNM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
             - name: Uploading core files
               uses: actions/upload-artifact@v3

.github/workflows/zap_templates.yaml

@@ -45,7 +45,12 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: linux
-
+            # Java formatting requires a newer java to run ktfmt
+            # TODO: this should be eventually inside Docker files
+            - name: Update java
+              run: |
+                apt-get update
+                DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing openjdk-17-jre
             - name: Generate all
               run: ./scripts/run_in_build_env.sh scripts/tools/zap_regen_all.py
             - name: Ensure git works in current working directory

config/esp32/components/chip/CMakeLists.txt

@@ -124,10 +124,18 @@ if(CONFIG_DISABLE_IPV4)
     chip_gn_arg_append("chip_inet_config_enable_ipv4"        "false")
 endif()
 
+if(CONFIG_DISABLE_READ_CLIENT)
+    chip_gn_arg_append("chip_enable_read_client"             "false")
+endif()
+
 if(CHIP_CODEGEN_PREGEN_DIR)
     chip_gn_arg_append("chip_code_pre_generated_directory"  "\"${CHIP_CODEGEN_PREGEN_DIR}\"")
 endif()
 
+if(CONFIG_ENABLE_ICD_SERVER)
+    chip_gn_arg_append("chip_enable_icd_server"               "true")
+endif()
+
 if(CONFIG_ENABLE_PW_RPC)
     string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n")
     chip_gn_arg_append("remove_default_configs"             "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:toolchain_cpp_standard\"]")