Merge remote-tracking branch 'upstream/master' into commissioning_fro…

…m_separate_class

.devcontainer/Dockerfile

@@ -53,8 +53,16 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
 RUN chmod +x /home/$USERNAME/bin/restyle-path
 RUN chown -R $USERNAME:$USERNAME /home/$USERNAME
 RUN echo "PATH=/home/$USERNAME/bin:${PATH}" >> /home/$USERNAME/.bashrc
+
 # $USERNAME needs to own the esp-idf and tools for the examples to build
 RUN chown -R $USERNAME:$USERNAME /opt/espressif/esp-idf
 RUN chown -R $USERNAME:$USERNAME /opt/espressif/tools
+
 # $USERNAME needs to own west configuration to build nRF Connect examples
-RUN chown -R $USERNAME:$USERNAME /opt/NordicSemiconductor/nrfconnect/.west
+RUN chown -R $USERNAME:$USERNAME /opt/NordicSemiconductor/nrfconnect/
+
+# allow read/write access to header and libraries
+RUN chown -R $USERNAME:$USERNAME /opt/ubuntu-21.04-aarch64-sysroot/usr/
+
+# allow licenses to be accepted
+RUN chown -R $USERNAME:$USERNAME /opt/android/sdk

.github/workflows/docker_img.yaml

@@ -31,8 +31,24 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                # TODO: Enables "-crosscompile" and "-vscode" images
-                img: ["", "-android", "-cirque", "-doxygen", "-efr32", "-esp32", "-esp32-qemu", "-infineon", "-k32w", "-mbed-os", "-nrf-platform", "-telink", "-tizen"]
+                img:
+                    - ""
+                    - "-ameba"
+                    - "-android"
+                    - "-cirque"
+                    - "-crosscompile"
+                    - "-doxygen"
+                    - "-efr32"
+                    - "-esp32"
+                    - "-esp32-qemu"
+                    - "-infineon"
+                    - "-k32w"
+                    - "-mbed-os"
+                    - "-nrf-platform"
+                    - "-telink"
+                    - "-tizen"
+                    # 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"
         steps:
             - name: Checkout
               uses: actions/checkout@v2
@@ -43,6 +59,7 @@ jobs:
             - name: Scan for vulnerabilities
               uses: crazy-max/docker-scan-action@master
               with:
-                  image: connectedhomeip/chip-build${{ matrix.img }}:0.5.33
+                  # NOTE: This task validates the images built previously with latest tag
+                  image: connectedhomeip/chip-build${{ matrix.img }}:latest
                   annotations: true
 

.github/workflows/examples-efr32.yaml

@@ -61,18 +61,23 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Build example EFR32 Lock App for BRD4161A
-              timeout-minutes: 10
+
+            - name: Build some BRD4161A variants
+              timeout-minutes: 30
               run: |
-                  scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_debug BRD4161A
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A lock-app \
-                    out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
-            - name: Build example EFR32 Lighting App for BRD4161A
-              timeout-minutes: 10
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --enable-flashbundle \
+                        --target-glob '*-brd4161a-{lock,light,unit-test}' \
+                        build \
+                        --copy-artifacts-to out/artifacts \
+                     "
+            - name: Prepare bloat report for light app
               run: |
-                  scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug BRD4161A
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A lighting-app \
-                    out/lighting_app_debug/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                     efr32 BRD4161A lighting-app \
+                     out/efr32-brd4161a-light/chip-efr32-lighting-example.out \
+                     /tmp/bloat_reports/
             - name: Build example EFR32 Lighting App for BRD4161A with RPCs
               timeout-minutes: 10
               run: |

.github/workflows/examples-infineon.yaml

@@ -61,23 +61,38 @@ jobs:
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-lock' build"
+                  "scripts/build/build_examples.py \
+                      --enable-flashbundle --no-log-timestamps \
+                      --target infineon-p6-lock \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default lock-app \
                     out/infineon-p6-lock/chip-p6-lock-example.out
             - name: Build all-clusters-app example
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-all-clusters' build"
+                  "scripts/build/build_examples.py \
+                      --enable-flashbundle --no-log-timestamps \
+                      --target infineon-p6-all-clusters \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default all-clusters-app \
                     out/infineon-p6-all-clusters/chip-p6-clusters-example.out
             - name: Build lighting-app example
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-light' build"
+                  "scripts/build/build_examples.py \
+                      --enable-flashbundle --no-log-timestamps \
+                      --target infineon-p6-light \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default light-app \
                     out/infineon-p6-light/chip-p6-lighting-example.out

.github/workflows/examples-linux-arm.yaml

@@ -0,0 +1,92 @@
+# 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: Build example - Linux ARM
+
+on:
+    push:
+    pull_request:
+
+concurrency:
+    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    cancel-in-progress: true
+
+jobs:
+    arm_crosscompile:
+        name: Linux ARM Cross compile
+        timeout-minutes: 70
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-crosscompile:0.5.33
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+
+            - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
+              env:
+                  GH_CONTEXT: ${{ toJson(github) }}
+              run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
+
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
+            - name: Uploading bootstrap logs
+              uses: actions/upload-artifact@v2
+              if: ${{ always() }} && ${{ !env.ACT }}
+              with:
+                  name: bootstrap-logs
+                  path: |
+                   .environment/gn_out/.ninja_log
+                   .environment/pigweed-venv/*.log
+            - name: Build Some samples
+              timeout-minutes: 20 
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target linux-arm64-all-clusters \
+                        --target linux-arm64-chip-tool-ipv6only \
+                        --target linux-arm64-minmdns \
+                        --target linux-arm64-thermostat-no-ble \
+                        build \
+                     "
+            - name: Bloat report - chip-tool
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    linux arm64 chip-tool-ipv6only \
+                    out/linux-arm64-chip-tool-ipv6only/chip-tool \
+                    /tmp/bloat_reports/
+            - name: Bloat report - thermostat
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    linux arm64 thermostat-no-ble \
+                    out/linux-arm64-thermostat-no-ble/thermostat-app \
+                    /tmp/bloat_reports/
+            - name: Uploading Size Reports
+              uses: actions/upload-artifact@v2
+              if: ${{ !env.ACT }}
+              with:
+                  name: Size,Linux-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  path: |
+                      /tmp/bloat_reports/

.pullapprove.yml

@@ -96,14 +96,14 @@ groups:
             teams: [reviewers-comcast]
         reviews:
             request: 10
-    # shared-reviewers-espressif:
-    #     type: optional
-    #     conditions:
-    #         - files.include('*')
-    #     reviewers:
-    #         teams: [reviewers-espressif]
-    #     reviews:
-    #         request: 10
+    shared-reviewers-espressif:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-espressif]
+        reviews:
+            request: 10
     shared-reviewers-google:
         type: optional
         conditions:
@@ -112,14 +112,14 @@ groups:
             teams: [reviewers-google]
         reviews:
             request: 10
-    # shared-reviewers-lg:
-    #     type: optional
-    #     conditions:
-    #         - files.include('*')
-    #     reviewers:
-    #         teams: [reviewers-lg]
-    #     reviews:
-    #         request: 10
+    shared-reviewers-lg:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-lg]
+        reviews:
+            request: 10
     shared-reviewers-nordic:
         type: optional
         conditions:
@@ -144,14 +144,14 @@ groups:
             teams: [reviewers-silabs]
         reviews:
             request: 10
-#     shared-reviewers-tcl:
-#         type: optional
-#         conditions:
-#             - files.include('*')
-#         reviewers:
-#             teams: [reviewers-tcl]
-#         reviews:
-#             request: 1
+    shared-reviewers-tcl:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-tcl]
+        reviews:
+            request: 1
 
     ############################################################
     #  Base Required Reviewers
@@ -164,7 +164,7 @@ groups:
             requests.
         type: required
         requirements:
-            - len(groups.approved.include('shared-reviewers-*')) >= 3
+            - len(groups.approved.include('shared-reviewers-*')) >= 2
         reviews:
             required: 0
         labels:

BUILD.gn

@@ -65,7 +65,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     deps = [
       "${chip_root}/src/app",
       "${chip_root}/src/ble",
-      "${chip_root}/src/channel",
       "${chip_root}/src/controller",
       "${chip_root}/src/credentials",
       "${chip_root}/src/crypto",

config/esp32/components/chip/CMakeLists.txt

@@ -99,6 +99,10 @@ if (CONFIG_OPENTHREAD_ENABLED)
     chip_gn_arg_append("chip_enable_openthread"                 "true")
 endif()
 
+if (CONFIG_OPENTHREAD_FTD)
+    chip_gn_arg_append("chip_openthread_ftd"                    "true")
+endif()
+
 if (CONFIG_ENABLE_OTA_REQUESTOR)
     chip_gn_arg_append("chip_enable_ota_requestor"                 "true")
 endif()

config/nrfconnect/chip-module/CMakeLists.txt

@@ -193,6 +193,7 @@ chip_gn_arg_string("zephyr_cxx"                             ${CMAKE_CXX_COMPILER
 chip_gn_arg_bool  ("is_debug"                               CONFIG_DEBUG)
 chip_gn_arg_bool  ("chip_logging"                           CONFIG_LOG)
 chip_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTHREAD)
+chip_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 chip_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
 chip_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
 chip_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)

config/telink/chip-module/CMakeLists.txt

@@ -194,6 +194,7 @@ chip_gn_arg_string("chip_project_config_include"            "${CHIP_PROJECT_CONF
 chip_gn_arg_string("chip_system_project_config_include"     "${CHIP_PROJECT_CONFIG}")
 chip_gn_arg_bool  ("is_debug"                               CONFIG_DEBUG)
 chip_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTHREAD)
+chip_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 chip_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
 chip_gn_arg_bool  ("chip_build_tests"                       CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)