Merge f3aa28c into 131b5e7

project-chip · Nov 10, 2020 · 3640134 · 3640134
2 parents 131b5e7 + f3aa28c
commit 3640134
Show file tree

Hide file tree

Showing 829 changed files with 26,723 additions and 122,805 deletions.
diff --git a/.chip-banner.txt b/.chip-banner.txt
diff --git a/.clang-format b/.clang-format
@@ -230,4 +230,7 @@ StatementMacros:
   - QT_REQUIRE_VERSION
 TabWidth:        8
 UseTab:          Never
+---
+Language: JavaScript
+ColumnLimit:     132
 ...
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -54,3 +54,5 @@ 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
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -13,7 +13,7 @@
         "dockerfile": "Dockerfile",
         "args": {
             //  "BUILD_VERSION": "$(cat integrations/docker/images/chip-build/version)" // trying to get this to work
-            "BUILD_VERSION": "0.4.8"
+            "BUILD_VERSION": "0.4.16"
         }
     },
     "remoteUser": "vscode",

diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
@@ -122,9 +122,6 @@ labelPRBasedOnFilePath:
     linux:
         - src/platform/Linux/*
 
-    nrf5:
-        - src/platform/nRF5/*
-
     nrf connect:
         - src/platform/nrfconnect/*
 

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -146,9 +146,6 @@ k32w:
 linux:
     - src/platform/Linux/*
 
-nrf5:
-    - src/platform/nRF5/*
-
 nrf connect:
     - src/platform/nrfconnect/*
 

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -28,11 +28,13 @@ jobs:
 
         env:
             BUILD_TYPE: android_${{ matrix.type }}
+            TARGET_CPU: ${{ matrix.type }}
+            JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64/
 
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-android:0.4.8
+            image: connectedhomeip/chip-build-android:0.4.16
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -43,10 +45,11 @@ jobs:
                   submodules: true
             - name: Bootstrap
               run: scripts/build/gn_bootstrap.sh
-            - name: Setup Build
+            - name: Build libs
               run: |
-                  GN_ARGS="is_clang=true target_os=\"android\" target_cpu=\"${{ matrix.type }}\" android_ndk_root=\"/opt/android/android-ndk-r21b\" android_sdk_root=\"/opt/android/sdk\""
-                  scripts/build/gn_gen.sh --args="$GN_ARGS"
-            - name: Run Build
+                  ./scripts/examples/android_app.sh
+            - name: Build App
               run: |
-                  scripts/build/gn_build.sh
+                  yes | "$ANDROID_HOME"/tools/bin/sdkmanager --licenses
+                  cd src/android/CHIPTool
+                  ./gradlew build
diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -24,7 +24,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.8
+            image: connectedhomeip/chip-build:0.4.16
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.8
+            image: connectedhomeip/chip-build:0.4.16
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -65,6 +65,5 @@ jobs:
               if: ${{ always() }}
               with:
                   name:
-                      cirque_log-${{
-                        steps.outsuffix.outputs.value }}
+                      cirque_log-${{steps.outsuffix.outputs.value}}-logs
                   path: /tmp/cirque_test_output/
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -0,0 +1,80 @@
+# 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 - EFR32
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    efr32:
+        name: EFR32
+        env:
+            EFR32_BOARD: BRD4161A
+            BUILD_TYPE: gn_efr32
+            BUILD_VERSION: 0.2.14
+
+        runs-on: ubuntu-latest
+
+        container:
+            image: connectedhomeip/chip-build-efr32:0.4.16
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+                - "/tmp/output_binaries:/tmp/output_binaries"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
+              with:
+                  fetch-depth: 0
+                  submodules: true
+            - name: Initialize CodeQL
+              uses: github/codeql-action/init@v1
+              with:
+                  languages: "cpp, python"
+                  queries: +security-and-quality
+            - name: Build example EFR32 Lock App for BRD4161A
+              run:
+                  scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/
+                  out/lock_app_debug BRD4161A
+            - name: Build example EFR32 Lighting App for BRD4161A
+              run:
+                  scripts/examples/gn_efr32_example.sh
+                  examples/lighting-app/efr32/ out/lighting_app_debug BRD4161A
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/action-cond@v1.0.0
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v2
+              with:
+                  name:
+                      ${{ env.BUILD_TYPE }}-example-build-${{
+                      steps.outsuffix.outputs.value }}
+                  path: |
+                      out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out
+                      out/lighting_app_debug/BRD4161A/chip-efr32-lighting-example.out
+            - name: Show tree
+              run: find .
+            - name: Remove third_party binaries for CodeQL Analysis
+              run: find out -type d -name "third_party" -exec rm -rf {} +
+            - name: Remove SiliconLabs binaries for CodeQL Analysis
+              run: find out -type d -name "SiliconLabs" -exec rm -rf {} +
+            - name: Perform CodeQL Analysis
+              if: ${{ github.event_name == 'push' }}
+              uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/examples-gn.yml → .github/workflows/examples-esp32.yaml b/.github/workflows/examples-gn.yml → .github/workflows/examples-esp32.yaml
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Examples - GN
+name: Build example - ESP32
 
 on:
     push:
     pull_request:
 
 jobs:
+    # TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
     esp32:
         name: ESP32
 
@@ -28,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.4.8
+            image: connectedhomeip/chip-build-esp32:0.4.16
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"
@@ -46,12 +47,12 @@ jobs:
                   languages: "cpp, python"
                   queries: +security-and-quality
             - name: Build example Echo App
-              run: scripts/examples/esp_echo_app.sh CHIP_BUILD_WITH_GN=y
+              run: scripts/examples/esp_echo_app.sh
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
-                  cp examples/wifi-echo/server/esp32/build/chip-wifi-echo.elf \
-                     example_binaries/$BUILD_TYPE-build/chip-wifi-echo.elf
+                  cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
             - name: Binary artifact suffix
               id: outsuffix
               uses: haya14busa/action-cond@v1.0.0

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -0,0 +1,91 @@
+# 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 Standalone
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    linux-standalone:
+        name: Linux Standalone
+
+        env:
+            BUILD_TYPE: gn_linux
+            BUILD_VERSION: 0.2.14
+            BUILD_IMAGE: chip-build
+            BUILD_ORG: connectedhomeip
+
+        runs-on: ubuntu-latest
+
+        container:
+            image: connectedhomeip/chip-build:0.4.16
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+                - "/tmp/output_binaries:/tmp/output_binaries"
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
+              with:
+                  fetch-depth: 0
+                  submodules: true
+            - name: Initialize CodeQL
+              uses: github/codeql-action/init@v1
+              with:
+                  languages: "cpp, python"
+                  queries: +security-and-quality
+            - name: Bootstrap
+              run: scripts/build/gn_bootstrap.sh
+            - name: Build example Standalone Echo Client
+              run:
+                  scripts/examples/gn_build_example.sh examples/chip-tool
+                  out/chip_tool_debug
+            - name: Build example Standalone Shell
+              run:
+                  scripts/examples/gn_build_example.sh examples/shell/standalone
+                  out/shell_debug
+            - name: Build example Standalone All Clusters Server 
+              run:
+                  scripts/examples/gn_build_example.sh examples/all-clusters-app/linux
+                  out/all_clusters_debug bypass_rendezvous=true
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/action-cond@v1.0.0
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v2
+              with:
+                  name:
+                      ${{ env.BUILD_TYPE }}-example-build-${{
+                      steps.outsuffix.outputs.value }}
+                  path: |
+                      out/chip_tool_debug/chip-tool
+                      out/shell_debug/chip-shell
+            - name: Show tree
+              run: find .
+            - 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 gen binaries for CodeQL Analysis
+              run: find out -type d -name "gen" -exec rm -rf {} +
+            - name: Perform CodeQL Analysis
+              if: ${{ github.event_name == 'push' }}
+              uses: github/codeql-action/analyze@v1