merge from master

.devcontainer/devcontainer.json

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

.github/.wordlist.txt

@@ -27,6 +27,7 @@ adb
 AddOrUpdateThreadNetwork
 AddOrUpdateWiFiNetwork
 addr
+AddThreadNetwork
 adk
 adoc
 AdvAutonomous
@@ -252,12 +253,14 @@ customizations
 cvfJ
 cxx
 CY
+CYW
 DAC
 DAP
 DataFrame
 dataset
 datasets
 dbf
+DBG
 dBm
 DBUILD
 dbus
@@ -316,6 +319,7 @@ DMM
 DNS
 Dnsmasq
 dnsmasqd
+DNSSD
 DNSStubListener
 Dockerfile
 Dockerfiles
@@ -355,6 +359,7 @@ elftools
 elock
 emberAfExternalAttributeReadCallback
 emberAfExternalAttributeWriteCallback
+EnableNetwork
 EnableWiFiNetwork
 EndpointId
 endpointName
@@ -414,6 +419,7 @@ fsl
 fstab
 fsync
 fullclean
+gbl
 gcloud
 GDB
 GeneralCommissioning
@@ -650,6 +656,7 @@ MoveToSaturation
 MoveWithOnOff
 MPSL
 MRP
+MTD
 MTU
 Multiband
 Multicast
@@ -722,6 +729,7 @@ OTA
 OTADownloader
 OTAImageProcessorDriver
 OTAImageProcessorInterface
+OTAProvider
 OTAProviderIpAddress
 OTAProviderNodeId
 OTAProviderSerialPort
@@ -837,6 +845,7 @@ RendezVousTest
 repo
 req
 Requestor
+Requestors
 responder
 retargeting
 reusability
@@ -940,6 +949,7 @@ submodules
 subprocess
 SubscribeResponse
 SubscriptionId
+subtype
 sudo
 svg
 SVR
@@ -978,6 +988,7 @@ testws
 texinfo
 textboxes
 TFT
+threadOperationalDataset
 ThreadStackManager
 ThreadStackManagerImpl
 Thunderboard
@@ -988,6 +999,7 @@ TLV
 tmp
 tngvndl
 TODO
+tokenized
 toolchain
 toolchains
 topologies

.github/workflows/android.yaml

@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.45
+            image: connectedhomeip/chip-build-android:0.5.48
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -57,11 +57,11 @@ jobs:
             - name: Build Android CHIPTool and CHIPTest
               run: |
                 ./scripts/run_in_build_env.sh \
-                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-{arm,arm64,x64,x86}-chip-*' build"
-            - name: Build Android Studio build (arm64 only)
-              run: |
-                ./scripts/run_in_build_env.sh \
-                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-androidstudio-arm64-chip-tool' build"
+                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-{arm,arm64}-chip-*' build"
+            # - name: Build Android Studio build (arm64 only)
+            #   run: |
+            #     ./scripts/run_in_build_env.sh \
+            #       "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-androidstudio-arm64-chip-tool' build"
             - name: Run Android build rule tests
               run: |
                 ./scripts/run_in_build_env.sh \

.github/workflows/bloat_check.yaml

@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.45
+            image: connectedhomeip/chip-build:0.5.48
 
         steps:
             - name: Checkout

.github/workflows/build.yaml

@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.45
+            image: connectedhomeip/chip-build:0.5.48
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -90,6 +90,11 @@ jobs:
             - name: Run Build Without Progress Logging
               timeout-minutes: 20
               run: scripts/run_in_build_env.sh "ninja -C ./out"
+            - name: Setup Build Without Error Logging
+              run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false chip_error_logging=false"
+            - name: Run Build Without Error Logging
+              timeout-minutes: 20
+              run: scripts/run_in_build_env.sh "ninja -C ./out"
     build_linux:
         name: Build on Linux (fake, gcc_release, clang, mbedtls, simulated)
         timeout-minutes: 90
@@ -98,7 +103,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.45
+            image: connectedhomeip/chip-build:0.5.48
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -118,11 +123,11 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Initialize CodeQL
-              if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
-              uses: github/codeql-action/init@v1
-              with:
-                 languages: "cpp"
+            # - name: Initialize CodeQL
+            #   if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
+            #   uses: github/codeql-action/init@v1
+            #   with:
+            #      languages: "cpp"
             - name: Bootstrap
               timeout-minutes: 10
               run: scripts/build/gn_bootstrap.sh
@@ -135,15 +140,15 @@ jobs:
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
             - name: Setup and Build Simulated Device
-              timeout-minutes: 10
+              timeout-minutes: 20
               run: |
                     BUILD_TYPE=simulated
                     GN_ARGS='chip_tests_zap_config="app1" chip_project_config_include_dirs=["../../examples/placeholder/linux/apps/app1/include", "../../config/standalone"] chip_config_network_layer_ble=false'
                     CHIP_ROOT_PATH=examples/placeholder/linux
                     CHIP_ROOT_PATH="$CHIP_ROOT_PATH" BUILD_TYPE="$BUILD_TYPE" scripts/build/gn_gen.sh --args="$GN_ARGS"
                     scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
             - name: Setup Build, Run Build and Run Tests
-              timeout-minutes: 50
+              timeout-minutes: 80
               run: |
                   for BUILD_TYPE  in fake gcc_release clang mbedtls; do
                       case $BUILD_TYPE in
@@ -187,15 +192,15 @@ jobs:
             # - name: Upload Code Coverage
             #   if: ${{ contains('main', env.BUILD_TYPE) }}
             #   run: bash <(curl -s https://codecov.io/bash)
-            - name: Remove third_party binaries for CodeQL Analysis
-              run: find out -type d -name "third_party" -exec rm -rf {} +
-            - name: Remove dbus binaries for CodeQL Analysis
-              run: find out -type d -name "dbus" -exec rm -rf {} +
-            - name: Remove nrfxlib binaries for CodeQL Analysis
-              run: find . -type d -name "nrfxlib" -exec rm -rf {} +
-            - name: Perform CodeQL Analysis
-              if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
-              uses: github/codeql-action/analyze@v1
+            # - name: Remove third_party binaries for CodeQL Analysis
+            #   run: find out -type d -name "third_party" -exec rm -rf {} +
+            # - name: Remove dbus binaries for CodeQL Analysis
+            #   run: find out -type d -name "dbus" -exec rm -rf {} +
+            # - name: Remove nrfxlib binaries for CodeQL Analysis
+            #   run: find . -type d -name "nrfxlib" -exec rm -rf {} +
+            # - name: Perform CodeQL Analysis
+            #   if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
+            #   uses: github/codeql-action/analyze@v1
     build_linux_python_lib:
         name: Build on Linux (python_lib)
         timeout-minutes: 60
@@ -204,7 +209,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.45
+            image: connectedhomeip/chip-build:0.5.48
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -240,7 +245,7 @@ jobs:
                   scripts/run_in_build_env.sh '(cd src/controller/python/test/unit_tests/ && python3 -m unittest -v)'
     build_darwin:
         name: Build on Darwin (clang, python_lib, simulated)
-        timeout-minutes: 90
+        timeout-minutes: 200
         runs-on: macos-latest
         if: github.actor != 'restyled-io[bot]'
 
@@ -249,11 +254,11 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Initialize CodeQL
-              if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
-              uses: github/codeql-action/init@v1
-              with:
-                 languages: "cpp"
+            #- name: Initialize CodeQL
+            #  if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
+            #  uses: github/codeql-action/init@v1
+            #  with:
+            #     languages: "cpp"
             - name: Setup Environment
               run: brew install openssl pkg-config
             - name: Try to ensure the directory for diagnostic log collection exists
@@ -279,15 +284,15 @@ jobs:
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
             - name: Setup and Build Simulated Device
-              timeout-minutes: 5
+              timeout-minutes: 20
               run: |
                     BUILD_TYPE=simulated
                     GN_ARGS='chip_tests_zap_config="app1" chip_project_config_include_dirs=["../../examples/placeholder/linux/apps/app1/include", "../../config/standalone"] chip_config_network_layer_ble=false'
                     CHIP_ROOT_PATH=examples/placeholder/linux
                     CHIP_ROOT_PATH="$CHIP_ROOT_PATH" BUILD_TYPE="$BUILD_TYPE" scripts/build/gn_gen.sh --args="$GN_ARGS"
                     scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
             - name: Setup Build, Run Build and Run Tests
-              timeout-minutes: 75
+              timeout-minutes: 80
               # Just go ahead and do the "all" build; on Darwin that's fairly
               # fast.  If this ever becomes slow, we can think about ways to do
               # the examples-linux-standalone.yaml tests on darwin without too
@@ -308,8 +313,9 @@ jobs:
               with:
                   name: crash-log-darwin
                   path: ~/Library/Logs/DiagnosticReports/
-            - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v1
+            # - name: Perform CodeQL Analysis
+            #   if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
+            #   uses: github/codeql-action/analyze@v1
             # TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
             # TODO https://github.com/project-chip/connectedhomeip/issues/1512
             # - name: Run Code Coverage

.github/workflows/cirque.yaml

@@ -29,7 +29,7 @@ jobs:
         timeout-minutes: 60
 
         env:
-            DOCKER_RUN_VERSION: 0.5.45
+            DOCKER_RUN_VERSION: 0.5.48
             GITHUB_CACHE_PATH: /tmp/cirque-cache/
 
         runs-on: ubuntu-latest
@@ -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.45
+#             image: connectedhomeip/chip-build-cirque:0.5.48
 #             volumes:
 #                 - "/tmp:/tmp"
 #                 - "/dev/pts:/dev/pts"

.github/workflows/doxygen.yaml

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

.github/workflows/examples-ameba.yaml

@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.5.45
+            image: connectedhomeip/chip-build-ameba:0.5.48
             options: --user root
 
         steps: