Merge branch master into develop for project-chip#23068.

.clang-tidy

@@ -1,36 +1,42 @@
 ---
 Checks: >
-  readability-else-after-return,
-  modernize-use-nullptr,
   bugprone-*,
-  -bugprone-not-null-terminated-result,
-  -bugprone-unused-return-value,
+  modernize-use-bool-literals,
+  modernize-use-nullptr,
+  performance-for-range-copy,
+  readability-const-return-type,
+  readability-else-after-return,
+  readability-redundant-control-flow,
+  readability-redundant-string-cstr,
+  readability-redundant-string-init,
   -bugprone-branch-clone,
+  -bugprone-copy-constructor-init,
   -bugprone-easily-swappable-parameters,
-  -bugprone-reserved-identifier,
-  -bugprone-macro-parentheses,
   -bugprone-forward-declaration-namespace,
   -bugprone-forwarding-reference-overload,
-  -bugprone-undelegated-constructor,
   -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-narrowing-conversions,
+  -bugprone-macro-parentheses,
   -bugprone-misplaced-widening-cast,
-  -bugprone-suspicious-include,
+  -bugprone-narrowing-conversions,
+  -bugprone-not-null-terminated-result,
+  -bugprone-reserved-identifier,
   -bugprone-signed-char-misuse,
-  -bugprone-copy-constructor-init,
+  -bugprone-suspicious-include,
+  -bugprone-undelegated-constructor,
+  -bugprone-unused-return-value,
   -clang-analyzer-core.CallAndMessage,
+  -clang-analyzer-core.NonNullParamChecker,
   -clang-analyzer-core.NullDereference,
-  -clang-analyzer-optin.cplusplus.UninitializedObject,
-  -clang-analyzer-optin.performance,
-  -clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,
-  -clang-analyzer-deadcode.DeadStores,
   -clang-analyzer-cplusplus.Move,
-  -clang-analyzer-optin.cplusplus.VirtualCall,
-  -clang-analyzer-security.insecureAPI.strcpy,
+  -clang-analyzer-deadcode.DeadStores,
   -clang-analyzer-nullability.NullablePassedToNonnull,
+  -clang-analyzer-optin.cplusplus.UninitializedObject,
+  -clang-analyzer-optin.cplusplus.VirtualCall,
+  -clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,
+  -clang-analyzer-optin.performance,
   -clang-analyzer-optin.performance.Padding,
   -clang-analyzer-security.insecureAPI.rand,
-  -clang-analyzer-core.NonNullParamChecker,
+  -clang-analyzer-security.insecureAPI.strcpy,
   -clang-analyzer-unix.Malloc,
   -clang-diagnostic-implicit-int-conversion
 WarningsAsErrors: '*'

.devcontainer/Dockerfile

@@ -86,3 +86,6 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
     && : # last line
 
 ENV TIZEN_ROOTFS /tizen_rootfs
+
+# Fast Model GDB plugins path for debugging support
+ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3

.devcontainer/devcontainer.json

@@ -17,7 +17,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.6.02"
+            "BUILD_VERSION": "0.6.03"
         }
     },
     "remoteUser": "vscode",
@@ -31,13 +31,12 @@
         "esbenp.prettier-vscode",
         "foxundermoon.shell-format",
         "github.vscode-pull-request-github",
-        "knisterpeter.vscode-github",
         "maelvalais.autoconf",
         "marus25.cortex-debug",
         "ms-azuretools.vscode-docker",
         "msedge-dev.gnls",
-        "npclaudiu.vscode-gn",
         "redhat.vscode-yaml",
+        "vadimcn.vscode-lldb",
         "xaver.clang-format",
         "yuichinukiyama.vscode-preview-server",
         "yzhang.markdown-all-in-one"

.github/dependabot.yml

@@ -7,3 +7,4 @@ updates:
     allow:
       - dependency-name: "third_party/pigweed/repo"
       - dependency-name: "third_party/mbedtls/repo"
+      - dependency-name: "third_party/openthread/repo"

.github/workflows/bloat_check.yaml

@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.02
+            image: connectedhomeip/chip-build:0.6.05
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15

.github/workflows/build.yaml

@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.02
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -133,7 +133,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.02
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -210,6 +210,10 @@ jobs:
                         BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
                         BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
                     done
+            - name: Ensure codegen is done for sanitize
+              timeout-minutes: 45
+              run: |
+                  ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
             - name: Clang-tidy validation
               timeout-minutes: 45
               run: |
@@ -283,7 +287,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.02
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -401,6 +405,10 @@ jobs:
                       scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
                       BUILD_TYPE=$BUILD_TYPE scripts/tests/gn_tests.sh
                   done
+            - name: Ensure codegen is done for sanitize
+              timeout-minutes: 45
+              run: |
+                  ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
             - name: Clang-tidy validation
               timeout-minutes: 45
               run: |

.github/workflows/chef.yaml

@@ -29,7 +29,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.02
+            image: connectedhomeip/chip-build:0.6.05
             options: --user root
 
         steps:
@@ -57,7 +57,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.02
+            image: connectedhomeip/chip-build-esp32:0.6.05
             options: --user root
 
         steps:
@@ -85,7 +85,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.6.02
+            image: connectedhomeip/chip-build-nrf-platform:0.6.05
             options: --user root
 
         steps:

.github/workflows/cirque.yaml

@@ -29,7 +29,7 @@ jobs:
         timeout-minutes: 90
 
         env:
-            DOCKER_RUN_VERSION: 0.6.02
+            DOCKER_RUN_VERSION: 0.6.05
             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.6.02
+        #             image: connectedhomeip/chip-build-cirque:0.6.05
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"

.github/workflows/darwin-tests.yaml

@@ -94,6 +94,7 @@ jobs:
                         --target darwin-x64-ota-provider-${BUILD_VARIANT} \
                         --target darwin-x64-ota-requestor-${BUILD_VARIANT} \
                         --target darwin-x64-tv-app-${BUILD_VARIANT} \
+                        --target darwin-x64-bridge-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
                      "
@@ -112,6 +113,7 @@ jobs:
                      --ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
                      --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
+                     --bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
                   "
             - name: Uploading core files
               uses: actions/upload-artifact@v2

.github/workflows/darwin.yaml

@@ -26,7 +26,7 @@ concurrency:
 jobs:
     darwin:
         name: Build Darwin
-        timeout-minutes: 120
+        timeout-minutes: 210
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest
@@ -64,28 +64,40 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Run iOS Build Debug
-              timeout-minutes: 30
+              timeout-minutes: 50
               working-directory: src/darwin/Framework
-              run: xcodebuild -target "Matter" -sdk iphoneos
+              # For now disable unguarded-availability-new warnings because we
+              # internally use APIs that we are annotating as only available on
+              # new enough versions.  Maybe we should change out deployment
+              # target versions instead?
+              run: xcodebuild -target "Matter" -sdk iphoneos OTHER_CFLAGS='${inherited} -Wno-unguarded-availability-new'
             - name: Run iOS Build Release
-              timeout-minutes: 30
+              timeout-minutes: 50
               working-directory: src/darwin/Framework
-              run: xcodebuild -target "Matter" -sdk iphoneos -configuration Release
+              # For now disable unguarded-availability-new warnings because we
+              # internally use APIs that we are annotating as only available on
+              # new enough versions.  Maybe we should change out deployment
+              # target versions instead?
+              run: xcodebuild -target "Matter" -sdk iphoneos -configuration Release OTHER_CFLAGS='${inherited} -Wno-unguarded-availability-new'
             - name: Clean Build
               run: xcodebuild clean
               working-directory: src/darwin/Framework
             - name: Delete Defaults
               run: defaults delete com.apple.dt.xctest.tool
               continue-on-error: true
             - name: Run macOS Build
-              timeout-minutes: 40
+              timeout-minutes: 70
               # Enable -Werror by hand here, because the Xcode config can't
               # enable it for various reasons.  Keep whatever Xcode settings
               # for OTHER_CFLAGS exist by using ${inherited}.
               #
               # Enable -Wconversion by hand as well, because it seems to not be
               # enabled by default in the Xcode config.
-              run: xcodebuild -target "Matter" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion'
+              #
+              # Disable -Wunguarded-availability-new because we internally use
+              # APIs we added after our deployment target version.  Maybe we
+              # should change the deployment target version instead?
+              run: xcodebuild -target "Matter" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new'
               working-directory: src/darwin/Framework
             - name: Clean Build
               run: xcodebuild clean
@@ -106,11 +118,15 @@ jobs:
               run: defaults delete com.apple.dt.xctest.tool
               continue-on-error: true
             - name: Run Framework Tests
-              timeout-minutes: 15
+              timeout-minutes: 20
+              # For now disable unguarded-availability-new warnings because we
+              # internally use APIs that we are annotating as only available on
+              # new enough versions.  Maybe we should change out deployment
+              # target versions instead?
               run: |
                   mkdir -p /tmp/darwin/framework-tests
                   ../../../out/debug/chip-all-clusters-app --interface-id -1 > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
-                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella' > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
+                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella -Wno-unguarded-availability-new' > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
               working-directory: src/darwin/Framework
             - name: Uploading log files
               uses: actions/upload-artifact@v2

.github/workflows/docker_img.yaml

@@ -54,6 +54,7 @@ jobs:
                     - "-telink"
                     - "-ti"
                     - "-tizen"
+                    - "-openiotsdk"
                     # NOTE: vscode image consumes ~52 GB disk space but GitHub-hosted runners provide ~10 GB free disk space(https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources)
                     #- "-vscode"
                     - "-zap"

.github/workflows/doxygen.yaml

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

.github/workflows/examples-ameba.yaml

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