Merge branch 'master' into ota-cluster-list-workaround

project-chip · Aug 2, 2021 · 155d69b · 155d69b
2 parents 39e7bbe + 3d8d542
commit 155d69b
Show file tree

Hide file tree

Showing 247 changed files with 8,709 additions and 5,014 deletions.
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -64,6 +64,17 @@ jobs:
               with:
                   path: ${{ env.GITHUB_CACHE_PATH }}
                   key: ${{ runner.os }}-cirque-${{ steps.cirque-key.outputs.val }}
+                  restore-keys: |
+                    ${{ runner.os }}-cirque-
+
+            - name: Bootstrap
+              timeout-minutes: 10
+              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 \
+                    -- scripts/build/gn_bootstrap.sh
 
             - name: Cirque Bootstrap
               timeout-minutes: 15
@@ -80,6 +91,18 @@ jobs:
                   cond: ${{ github.event.pull_request.number == '' }}
                   if_true: "${{ github.sha }}"
                   if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Build Binaries
+              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 \
+                    -- ./gn_build.sh \
+                    chip_build_tests=false \
+                    enable_host_gcc_build=true \
+                    enable_host_gcc_mbedtls_build=false \
+                    enable_host_clang_build = false
             - name: Run Tests
               timeout-minutes: 25
               run: |

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -17,6 +17,7 @@ name: Build example - Mbed OS
 on:
     push:
     pull_request:
+    workflow_dispatch:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -37,6 +38,7 @@ jobs:
             EXAMPLE_PROFILE: release
 
         runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
 
         container:
             image: connectedhomeip/chip-build-mbed-os:latest

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -87,7 +87,6 @@ jobs:
             - name: Run Tests
               timeout-minutes: 10
               run: |
-                  ifconfig -a
                   scripts/tests/test_suites.sh
             - name: Run TV Tests
               timeout-minutes: 10

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -35,10 +35,10 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Use Node.js 12.x
+            - name: Use Node.js 14.x
               uses: actions/setup-node@v1
               with:
-                node-version: '12.x'
+                node-version: '14.x'
             - name: Use Java 
               uses: actions/setup-java@v2
               with:

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -385,7 +385,7 @@ menu "CHIP Device Layer"
         config DEFAULT_DEVICE_PRODUCT_REVISION
             int "Default Device Product Revision"
             range 0 65535
-            default 1
+            default 0
             help
                 The default device product revision.
 

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -3240,7 +3240,7 @@
               "outgoing": 0
             },
             {
-              "name": "AddOpCert",
+              "name": "AddNOC",
               "code": 6,
               "mfgCode": null,
               "source": "client",
@@ -3331,7 +3331,7 @@
               "outgoing": 1
             },
             {
-              "name": "OpCertResponse",
+              "name": "NOCResponse",
               "code": 8,
               "mfgCode": null,
               "source": "server",
@@ -3355,6 +3355,36 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "supported fabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "commissioned fabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "cluster revision",
               "code": 65533,
@@ -12973,6 +13003,22 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
+            },
+            {
+              "name": "TestSpecific",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestAddArguments",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
             }
           ],
           "attributes": [
@@ -13008,6 +13054,14 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 1
+            },
+            {
+              "name": "TestAddArgumentsResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
             }
           ],
           "attributes": [