Merge branch 'master' into fix-fabric-print

.devcontainer/devcontainer.json

@@ -17,7 +17,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.5.84"
+            "BUILD_VERSION": "0.5.89"
         }
     },
     "remoteUser": "vscode",

.github/.wordlist.txt

@@ -22,6 +22,7 @@ acdbc
 ACKed
 ACL
 ACLs
+actdiag
 AdapterAddress
 AdapterName
 adb
@@ -42,11 +43,16 @@ AdvSendAdvert
 AE
 aef
 AES
+AlarmCode
 algs
 alloc
 Ameba
 amebad
+AmebaD
 amebaiot
+AmebaZ
+amebaz2
+AmebaZ2
 announcementReason
 AnnounceOTAProvider
 AnnounceOtaProviderRequest
@@ -77,6 +83,9 @@ argc
 args
 argv
 armeabi
+armino
+Armino
+ARMINO
 ARMmbed
 armv
 ASAN
@@ -125,8 +134,10 @@ BDX
 BDXDownloader
 BeagleBone
 befc
+BEKEN
 betaprogram
 BinaryInputBasic
+Binfmt
 bitbake
 bld
 BLE
@@ -137,6 +148,7 @@ BLEManagerImpl
 BlePlatformDelegate
 Blinls
 bloaty
+blockdiag
 blocklist
 blockquote
 bluetoothd
@@ -149,7 +161,6 @@ bouffalolab
 BRD
 breakpoint
 bredr
-BridgedActions
 BridgedDeviceBasic
 bridgedLightEndpoint
 bringup
@@ -161,7 +172,9 @@ btmgmt
 BTN
 BTP
 btvirt
+BuildKit
 buildwithmatter
+buildX
 burndown
 ButtonIsr
 BytesMain
@@ -179,6 +192,7 @@ CatalogVendorId
 CBB
 cbd
 CBOR
+Ccache
 ccf
 CCMP
 CCS
@@ -222,6 +236,7 @@ ChlorineConcentrationMeasurement
 ChlorodibromomethaneConcentrationMeasurement
 ChloroformConcentrationMeasurement
 chmod
+chown
 chrpath
 CIPD
 CircleCI
@@ -373,6 +388,7 @@ DeviceCommissioner
 DeviceCommon
 DeviceController
 DeviceId
+DeviceInstanceInfoProvider
 DeviceLayer
 DeviceNetworkProvisioningDelegate
 DeviceNetworkProvisioningDelegateImpl
@@ -420,6 +436,7 @@ Dockerfile
 Dockerfiles
 Don'ts
 DoorLock
+DoorState
 doru
 DOTBR
 DOVERLAY
@@ -486,6 +503,7 @@ EthyleneOxideConcentrationMeasurement
 EvalCode
 EvalCodeWithName
 EvalFrameDefault
+EVB
 evk
 exceptfds
 ExchangeContext
@@ -859,6 +877,7 @@ multilib
 Multiprotocol
 multithreaded
 mutexes
+mv
 MX
 mydir
 MyPASSWORD
@@ -905,6 +924,7 @@ nullptr
 NUM
 NVM
 NVS
+nwdiag
 nwk
 NXP
 objcopy
@@ -1121,6 +1141,7 @@ rsn
 RSSI
 RST
 rsync
+rtd
 RTL
 rtld
 RTOS
@@ -1154,6 +1175,7 @@ semver
 SendButton
 SendNewInputEvent
 sendto
+seqdiag
 SERIALDEVICE
 SerialNumber
 ServiceId
@@ -1168,6 +1190,7 @@ SetRequestorInstance
 SetUpPINCode
 SetupQRCode
 sexualized
+sfv
 SHA
 ShadeConfiguration
 showDocumentation
@@ -1198,6 +1221,7 @@ SoftwareVersion
 softwareVersionStr
 SoftwareVersionString
 softwareVersionValid
+sphinxcontrib
 SPI
 spiflash
 spinel
@@ -1230,6 +1254,7 @@ submodules
 subprocess
 SubscribeResponse
 SubscriptionId
+substeps
 subtype
 sudo
 SulfateConcentrationMeasurement
@@ -1456,6 +1481,7 @@ xFFFF
 xfffff
 xFFFFFFEFFFFFFFFF
 xtensa
+xvzf
 xwayland
 xyz
 xz
@@ -1476,6 +1502,7 @@ zclsubscribe
 zclwrite
 ZephyrConfig
 zephyrproject
+zhengyaohan
 Zigbee
 zigbeealliance
 zigbeethread

.github/workflows/bloat_check.yaml

@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.84
+            image: connectedhomeip/chip-build:0.5.91
 
         steps:
             - uses: Wandalen/[email protected]

.github/workflows/build.yaml

@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.84
+            image: connectedhomeip/chip-build:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -128,7 +128,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.84
+            image: connectedhomeip/chip-build:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -279,7 +279,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.84
+            image: connectedhomeip/chip-build:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -377,21 +377,20 @@ jobs:
                   scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
             - name: Setup Build, Run Build and Run Tests
               timeout-minutes: 120
+              # We can't enable leak checking here in LSAN_OPTIONS, because on
+              # Darwin that's only supported with a new enough clang, and we're
+              # not building with the pigweed clang here.
               run: |
                   for BUILD_TYPE in default python_lib; do
                       case $BUILD_TYPE in
                           # 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 a few
-                          # redundant things:
-                          #
-                          # * the mbedtls build, since we don't really plan to
-                          #   use that on Darwin.
-                          # * the "host clang" build, which uses the pigweed
-                          #   clang.
-                          "default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false enable_host_clang_boringssl_crypto_tests=false';;
+                          # save CI resources we want to exclude the
+                          # "host clang" build, which uses the pigweed
+                          # clang.
+                          "default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
                           "python_lib") GN_ARGS='enable_rtti=true enable_pylib=true';;
                       esac
                       BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands

.github/workflows/chef.yaml

@@ -23,14 +23,13 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-
     chef_linux:
         name: Chef - Linux CI Examples
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.84
+            image: connectedhomeip/chip-build:0.5.91
             options: --user root
 
         steps:
@@ -50,15 +49,15 @@ jobs:
             - name: CI Examples Linux
               shell: bash
               run: |
-                ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t linux"
+                  ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t linux"
 
     chef_esp32:
         name: Chef - ESP32 CI Examples
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.84
+            image: connectedhomeip/chip-build-esp32:0.5.91
             options: --user root
 
         steps:
@@ -78,15 +77,15 @@ jobs:
             - name: CI Examples ESP32
               shell: bash
               run: |
-                ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t esp32"
+                  ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t esp32"
 
     chef_nrfconnect:
         name: Chef - NRFConnect CI Examples
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.84
+            image: connectedhomeip/chip-build-nrf-platform:0.5.91
             options: --user root
 
         steps:

.github/workflows/cherry-picks.yaml

@@ -14,19 +14,9 @@ jobs:
             (github.event.pull_request.merged == true)
             && (
                    (contains(github.event.pull_request.labels.*.name, 'sve'))
-                || (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
-                || (contains(github.event.pull_request.labels.*.name, 'spec'))
-                || (contains(github.event.pull_request.labels.*.name, 'platform'))
-                || (contains(github.event.pull_request.labels.*.name, 'darwin'))
-                || (contains(github.event.pull_request.labels.*.name, 'android'))
-                || (contains(github.event.pull_request.labels.*.name, 'examples'))
-                || (contains(github.event.pull_request.labels.*.name, 'scripts'))
-                || (contains(github.event.pull_request.labels.*.name, 'tests'))
-                || (contains(github.event.pull_request.labels.*.name, 'integrations'))
-                || (contains(github.event.pull_request.labels.*.name, 'request sve'))
-                || (contains(github.event.pull_request.labels.*.name, 'workflows'))
-                || (contains(github.event.pull_request.labels.*.name, 'github'))
-                || (contains(github.event.pull_request.labels.*.name, 'sve cherry-pick'))
+               ||  (contains(github.event.pull_request.labels.*.name, 'spec'))
+               ||  (contains(github.event.pull_request.labels.*.name, 'request sve'))
+               ||  (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
             )
         steps:
             - name: Checkout
@@ -37,7 +27,7 @@ jobs:
               uses: carloscastrojumo/[email protected]
               with:
                   token: ${{ secrets.MATTER_PAT }}
-                  branch: sve
+                  branch: sve-2
                   labels: |
                       sve cherry pick
                   reviewers: |

.github/workflows/cirque.yaml

@@ -38,7 +38,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: connectedhomeip/chip-build-cirque:0.5.84
+        #             image: connectedhomeip/chip-build-cirque:0.5.91
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"

.github/workflows/darwin-tests.yaml

@@ -32,9 +32,10 @@ jobs:
 
         strategy:
             matrix:
-                build_variant: [no-ble-asan]
+                build_variant: [no-ble-asan-clang]
         env:
             BUILD_VARIANT: ${{matrix.build_variant}}
+            LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest
@@ -102,7 +103,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
-                     --target-skip-glob '{TestGroupMessaging,TestAccessControlConstraints}' \
+                     --target-skip-glob '{TestAccessControlConstraints}' \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \

.github/workflows/docker_img.yaml

@@ -42,7 +42,12 @@ jobs:
                     - "-esp32"
                     - "-esp32-qemu"
                     - "-infineon"
-                    - "-imx"
+                    # NOTE: imx image requires too much space for GitHub-hosted runners. It fails with:
+                    # ```
+                    # ....
+                    # ApplyLayer exit status 1 stdout:  stderr: write /opt/fsl-imx-xwayland/5.15-kirkstone/sysroots/armv8a-poky-linux/opt/ltp/testcases/bin/fanotify15: no space left on device
+                    # ```
+                    # - "-imx"
                     - "-k32w"
                     - "-mbed-os"
                     - "-nrf-platform"

.github/workflows/doxygen.yaml

@@ -82,7 +82,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-doxygen:0.5.84
+            image: connectedhomeip/chip-build-doxygen:0.5.91
 
         if: github.actor != 'restyled-io[bot]'