Merge branch 'master' into master

.devcontainer/devcontainer.json

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

.flake8

@@ -1,2 +1,103 @@
 [flake8]
 max-line-length = 132
+exclude = third_party
+          .*
+          out/*
+          scripts/idl/*
+          ./examples/common/QRCode/*
+          # temporarily scan only directories with fixed files
+          # TODO: Remove the paths below when all bugs are fixed
+          src/tools/chip-cert/*
+          src/test_driver/mbed/*
+          src/test_driver/linux-cirque/*
+          build/chip/java/tests/*
+          build/chip/linux/*
+          build/config/linux/*
+          credentials/fetch-paa-certs-from-dcl.py
+          docs/_extensions/external_content.py
+          examples/common/pigweed/rpc_console/py/chip_rpc/console.py
+          examples/lighting-app/python/lighting.py
+          examples/platform/mbed/ota/generate_ota_list_image.py
+          scripts/build/build/target.py
+          scripts/build/build/targets.py
+          scripts/build/builders/android.py
+          scripts/build/builders/bouffalolab.py
+          scripts/build/builders/cc13x2x7_26x2x7.py
+          scripts/build/builders/genio.py
+          scripts/build/builders/gn.py
+          scripts/build/builders/imx.py
+          scripts/build/builders/infineon.py
+          scripts/build/builders/nrf.py
+          scripts/codegen.py
+          scripts/codepregen.py
+          scripts/error_table.py
+          scripts/examples/gn_to_cmakelists.py
+          scripts/flashing/bouffalolab_firmware_utils.py
+          scripts/flashing/cyw30739_firmware_utils.py
+          scripts/flashing/nrfconnect_firmware_utils.py
+          scripts/gen_chip_version.py
+          scripts/helpers/bloat_check.py
+          scripts/pregenerate/using_codegen.py
+          scripts/pregenerate/using_zap.py
+          scripts/py_matter_yamltests/matter_yamltests/constraints.py
+          scripts/py_matter_yamltests/matter_yamltests/definitions.py
+          scripts/py_matter_yamltests/matter_yamltests/fixes.py
+          scripts/py_matter_yamltests/matter_yamltests/parser.py
+          scripts/py_matter_yamltests/matter_yamltests/pics_checker.py
+          scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/pseudo_clusters.py
+          scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py
+          scripts/py_matter_yamltests/test_pics_checker.py
+          scripts/py_matter_yamltests/test_spec_definitions.py
+          scripts/py_matter_yamltests/test_yaml_loader.py
+          scripts/py_matter_yamltests/test_yaml_parser.py
+          scripts/run-clang-tidy-on-compile-commands.py
+          scripts/setup/nrfconnect/update_ncs.py
+          scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
+          scripts/tools/check_zcl_file_sync.py
+          scripts/tools/convert_ini.py
+          scripts/tools/memory/memdf/__init__.py
+          scripts/tools/memory/report_summary.py
+          scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
+          scripts/tools/nrfconnect/nrfconnect_generate_partition.py
+          scripts/tools/nrfconnect/tests/test_generate_factory_data.py
+          scripts/tools/silabs/FactoryDataProvider.py
+          scripts/tools/telink/mfg_tool.py
+          scripts/tools/zap/generate.py
+          scripts/tools/zap/prune_outputs.py
+          scripts/tools/zap/version_update.py
+          scripts/tools/zap/zap_download.py
+          scripts/tools/zap_convert_all.py
+          src/app/ota_image_tool.py
+          src/app/zap_cluster_list.py
+          src/controller/python/build-chip-wheel.py
+          src/controller/python/chip-device-ctrl.py
+          src/controller/python/chip/CertificateAuthority.py
+          src/controller/python/chip/ChipBleUtility.py
+          src/controller/python/chip/ChipBluezMgr.py
+          src/controller/python/chip/ChipCommissionableNodeCtrl.py
+          src/controller/python/chip/ChipCoreBluetoothMgr.py
+          src/controller/python/chip/ChipDeviceCtrl.py
+          src/controller/python/chip/ChipReplStartup.py
+          src/controller/python/chip/ChipStack.py
+          src/controller/python/chip/ChipUtility.py
+          src/controller/python/chip/FabricAdmin.py
+          src/controller/python/chip/ble/scan_devices.py
+          src/controller/python/chip/clusters/Attribute.py
+          src/controller/python/chip/clusters/ClusterObjects.py
+          src/controller/python/chip/clusters/Command.py
+          src/controller/python/chip/clusters/__init__.py
+          src/controller/python/chip/discovery/__init__.py
+          src/controller/python/chip/interaction_model/__init__.py
+          src/controller/python/chip/interaction_model/delegate.py
+          src/controller/python/chip/internal/commissioner.py
+          src/controller/python/chip/setup_payload/setup_payload.py
+          src/controller/python/chip/storage/__init__.py
+          src/controller/python/chip/tlv/__init__.py
+          src/controller/python/chip/utils/CommissioningBuildingBlocks.py
+          src/controller/python/chip/yaml/__init__.py
+          src/controller/python/chip/yaml/format_converter.py
+          src/controller/python/chip/yaml/runner.py
+          src/lib/asn1/gen_asn1oid.py
+          src/pybindings/pycontroller/build-chip-wheel.py
+          src/pybindings/pycontroller/pychip/__init__.py
+          src/setup_payload/python/generate_setup_payload.py

.github/workflows/bloat_check.yaml

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

.github/workflows/build.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.35
+            image: connectedhomeip/chip-build:0.6.47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -69,6 +69,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |
@@ -147,7 +148,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.35
+            image: connectedhomeip/chip-build:0.6.47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -185,6 +186,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |
@@ -316,7 +318,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.35
+            image: connectedhomeip/chip-build:0.6.47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -344,6 +346,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |
@@ -402,6 +405,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |
@@ -481,7 +485,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.35
+            image: connectedhomeip/chip-build:0.6.47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -501,6 +505,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |

.github/workflows/chef.yaml

@@ -30,7 +30,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.35
+            image: connectedhomeip/chip-build:0.6.47
             options: --user root
 
         steps:
@@ -46,6 +46,7 @@ jobs:
               run: scripts/checkout_submodules.py --shallow --platform linux
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |
@@ -65,7 +66,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.35
+            image: connectedhomeip/chip-build-esp32:0.6.47
             options: --user root
 
         steps:
@@ -81,6 +82,7 @@ jobs:
               run: scripts/checkout_submodules.py --shallow --platform esp32
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |
@@ -100,7 +102,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.6.35
+            image: connectedhomeip/chip-build-nrf-platform:0.6.47
             options: --user root
 
         steps:
@@ -116,6 +118,7 @@ jobs:
               run: scripts/checkout_submodules.py --shallow --platform nrfconnect
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |

.github/workflows/cherry-picks.yaml

@@ -20,11 +20,11 @@ jobs:
             )
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   fetch-depth: 0
             - name: Cherry-Pick into sve branch
-              uses: carloscastrojumo/[email protected].1
+              uses: carloscastrojumo/[email protected].9
               with:
                   token: ${{ secrets.MATTER_PAT }}
                   branch: sve-2

.github/workflows/cirque.yaml

@@ -30,16 +30,16 @@ jobs:
         timeout-minutes: 90
 
         env:
-            DOCKER_RUN_VERSION: 0.6.35
-            GITHUB_CACHE_PATH: /tmp/cirque-cache/
+            DOCKER_RUN_VERSION: 0.6.47
+            GITHUB_CACHE_PATH: /tmp/cirque-cache
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         # 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.6.35
+        #             image: connectedhomeip/chip-build-cirque:0.6.47
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
@@ -60,33 +60,36 @@ jobs:
             - name: Checkout submodules
               run: scripts/checkout_submodules.py --shallow --platform linux
 
-            - name: Get cirque cache key
-              id: cirque-key
-              run: |
-                  echo "::set-output name=val::$(scripts/tests/cirque_tests.sh cachekeyhash)"
-
-            - name: Cache
-              uses: actions/cache@v2
+            - name: Bootstrap cache
+              uses: actions/cache@v3
+              timeout-minutes: 10
               if: ${{ !env.ACT }}
-              id: cache
               with:
-                  path: ${{ env.GITHUB_CACHE_PATH }}
-                  key: ${{ runner.os }}-cirque-${{ steps.cirque-key.outputs.val }}
-                  restore-keys: |
-                      ${{ runner.os }}-cirque-
-
+                  key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
+                  path: |
+                      .environment
+                      build_overrides/pigweed_environment.gni
             - name: Bootstrap
               timeout-minutes: 15
               run: |
                   integrations/docker/images/chip-build-cirque/run.sh \
-                    --env GITHUB_ACTION_RUN=1 \
-                    --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
-                    --volume /tmp:/tmp \
-                    -- sh -c '\
-                       git config --global --add safe.directory "*" \
+                    -- sh -c " \
+                       git config --global --add safe.directory '*' \
                        && scripts/build/gn_bootstrap.sh \
-                    '
+                       && chown -R $(id -u):$(id -g) .environment \
+                    "
 
+            - name: Get Cirque Bootstrap cache key
+              id: cirque-bootstrap-cache-key
+              run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
+            - name: Cirque Bootstrap cache
+              uses: actions/cache@v3
+              timeout-minutes: 10
+              if: ${{ !env.ACT }}
+              with:
+                  key: ${{ runner.os }}-cirque-${{ steps.cirque-bootstrap-cache-key.outputs.val }}
+                  restore-keys: ${{ runner.os }}-cirque-
+                  path: ${{ env.GITHUB_CACHE_PATH }}
             - name: Cirque Bootstrap
               timeout-minutes: 15
               run: |
@@ -95,6 +98,7 @@ jobs:
                     --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
                     --volume /tmp:/tmp \
                     -- scripts/tests/cirque_tests.sh bootstrap
+
             - name: Artifact suffix
               id: outsuffix
               uses: haya14busa/action-cond@v1
@@ -107,13 +111,10 @@ jobs:
               timeout-minutes: 30
               run: |
                   integrations/docker/images/chip-build-cirque/run.sh \
-                    --env GITHUB_ACTION_RUN=1 \
-                    --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
-                    --volume /tmp:/tmp \
-                    -- sh -c '\
-                       git config --global --add safe.directory "*" \
-                       && scripts/build/gn_gen_cirque.sh
-                      '
+                    -- sh -c " \
+                       git config --global --add safe.directory '*' \
+                       && scripts/build/gn_gen_cirque.sh \
+                      "
             - name: Run Tests
               timeout-minutes: 45
               run: |
@@ -125,6 +126,7 @@ jobs:
                      --volume /tmp:/tmp \
                      --volume /dev/pts:/dev/pts \
                      -- scripts/tests/cirque_tests.sh run_all_tests
+
             - name: Uploading Binaries
               uses: actions/upload-artifact@v3
               if: ${{ always() && !env.ACT }}

.github/workflows/darwin-tests.yaml

@@ -68,6 +68,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |

.github/workflows/darwin.yaml

@@ -48,6 +48,7 @@ jobs:
 
             - name: Bootstrap cache
               uses: actions/cache@v3
+              timeout-minutes: 10
               with:
                   key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
                   path: |

.github/workflows/docbuild.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: matter
           fetch-depth: 0