Merge branch 'master' into python/fix-threading-model-final

project-chip · Jul 7, 2022 · ab27923 · ab27923
2 parents fa7ac2f + 7514699
commit ab27923
Show file tree

Hide file tree

Showing 825 changed files with 113,341 additions and 68,870 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -17,7 +17,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.5.79"
+            "BUILD_VERSION": "0.5.84"
         }
     },
     "remoteUser": "vscode",

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -126,6 +126,11 @@ setup payload:
 ############################################################
 platform:
     - src/platform/*
+    - config/tizen/chip-gn/platform/*
+    - examples/platform/*
+    - scripts/tools/memory/platform/*
+    - src/include/platform/*
+    - src/lib/dnssd/platform/*
 
 darwin:
     - src/platform/Darwin/*

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
 
         steps:
             - uses: Wandalen/[email protected]

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -67,7 +67,7 @@ jobs:
               run: scripts/build/gn_bootstrap.sh
             - name: Uploading bootstrap logs
               uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
+              if: ${{ always() && !env.ACT }}
               with:
                   name: bootstrap-logs
                   path: |
@@ -106,15 +106,15 @@ jobs:
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Uploading core files
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
                   name: crash-core-linux-gcc-debug
                   path: /tmp/cores/
                   # Cores are big; don't hold on to them too long.
                   retention-days: 5
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
                   name: crash-objdir-linux-gcc-debug
                   path: out/
@@ -128,7 +128,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -168,7 +168,7 @@ jobs:
               run: scripts/build/gn_bootstrap.sh
             - name: Uploading bootstrap logs
               uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
+              if: ${{ always() && !env.ACT }}
               with:
                   name: bootstrap-logs
                   path: |
@@ -239,15 +239,15 @@ jobs:
                     "./scripts/build/build_examples.py --no-log-timestamps --target linux-fake-tests build"
             - name: Uploading core files
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
                   name: crash-core-linux
                   path: /tmp/cores/
                   # Cores are big; don't hold on to them too long.
                   retention-days: 5
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
                   name: crash-objdir-linux
                   path: out/
@@ -279,7 +279,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -359,7 +359,7 @@ jobs:
               run: scripts/build/gn_bootstrap.sh
             - name: Uploading bootstrap logs
               uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
+              if: ${{ always() && !env.ACT }}
               with:
                   name: bootstrap-logs
                   path: |
@@ -407,7 +407,7 @@ jobs:
                     "
             - name: Uploading diagnostic logs
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
                   name: crash-log-darwin
                   path: ~/Library/Logs/DiagnosticReports/

diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -30,7 +30,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             options: --user root
 
         steps:
@@ -42,6 +42,11 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
+            - name: Checkout submodules
+              run: scripts/checkout_submodules.py --shallow --platform linux
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
             - name: CI Examples Linux
               shell: bash
               run: |
@@ -53,7 +58,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.79
+            image: connectedhomeip/chip-build-esp32:0.5.84
             options: --user root
 
         steps:
@@ -65,6 +70,11 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
+            - name: Checkout submodules
+              run: scripts/checkout_submodules.py --shallow --platform esp32
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
             - name: CI Examples ESP32
               shell: bash
               run: |
@@ -76,7 +86,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.79
+            image: connectedhomeip/chip-build-nrf-platform:0.5.84
             options: --user root
 
         steps:
@@ -88,6 +98,11 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
+            - name: Checkout submodules
+              run: scripts/checkout_submodules.py --shallow --platform nrfconnect
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
             - name: CI Examples NRFConnect
               shell: bash
               run: |

diff --git a/.github/workflows/cherry-picks.yaml b/.github/workflows/cherry-picks.yaml
@@ -0,0 +1,42 @@
+name: Cherry-Pick Merges
+
+on:
+    pull_request_target:
+        branches:
+            - master
+        types: ["closed"]
+
+jobs:
+    cherry_pick_release_v1_0:
+        runs-on: ubuntu-latest
+        name: Cherry-Pick into SVE
+        if: |
+            (github.event.pull_request.merged == true)
+            && (
+                   (contains(github.event.pull_request.labels.*.name, 'sve'))
+                || (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
+                || (contains(github.event.pull_request.labels.*.name, 'spec'))
+                || (contains(github.event.pull_request.labels.*.name, 'platform'))
+                || (contains(github.event.pull_request.labels.*.name, 'darwin'))
+                || (contains(github.event.pull_request.labels.*.name, 'android'))
+                || (contains(github.event.pull_request.labels.*.name, 'examples'))
+                || (contains(github.event.pull_request.labels.*.name, 'scripts'))
+                || (contains(github.event.pull_request.labels.*.name, 'workflows'))
+                || (contains(github.event.pull_request.labels.*.name, 'github'))
+                || (contains(github.event.pull_request.labels.*.name, 'sve cherry-pick'))
+            )
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+            - name: Cherry-Pick into sve branch
+              uses: carloscastrojumo/[email protected]
+              with:
+                  token: ${{ secrets.MATTER_PAT }}
+                  branch: sve
+                  reviewers: |
+                      woody-apple
+                      andy31415
+env:
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -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.79
+        #             image: connectedhomeip/chip-build-cirque:0.5.84
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
@@ -127,7 +127,7 @@ jobs:
                      -- scripts/tests/cirque_tests.sh run_all_tests
             - name: Uploading Binaries
               uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
+              if: ${{ always() && !env.ACT }}
               with:
                   name: cirque_log-${{steps.outsuffix.outputs.value}}-logs
                   path: /tmp/cirque_test_output/
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
@@ -20,8 +20,7 @@ on:
     workflow_dispatch:
 
 concurrency:
-    group:
-        ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
+    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
@@ -74,65 +73,84 @@ jobs:
               run: scripts/build/gn_bootstrap.sh
             - name: Uploading bootstrap logs
               uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
+              if: ${{ always() && !env.ACT }}
               with:
-                  name:
-                      bootstrap-logs-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: bootstrap-logs-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: |
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
-            - name: Build Apps
-              timeout-minutes: 60
+            - name: Delete Defaults
+              run: defaults delete com.apple.dt.xctest.tool
+              continue-on-error: true
+            - name: Run macOS Build
+              timeout-minutes: 40
+              # 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}.
+              #
+              # Disable -Wmacro-redefined because CHIP_DEVICE_CONFIG_ENABLE_MDNS
+              # seems to be unconditionally defined in CHIPDeviceBuildConfig.h,
+              # which is apparently being included after CHIPDeviceConfig.h.
+              run: xcodebuild -target "Matter" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wno-macro-redefined'
+              working-directory: src/darwin/Framework
+            - name: Copying Framework to Temporary Path
+              continue-on-error: true
               run: |
-                  ./scripts/run_in_build_env.sh \
-                     "./scripts/build/build_examples.py \
-                        --target darwin-x64-darwin-framework-tool-${BUILD_VARIANT} \
-                        --target darwin-x64-all-clusters-${BUILD_VARIANT} \
-                        --target darwin-x64-lock-${BUILD_VARIANT} \
-                        --target darwin-x64-ota-provider-${BUILD_VARIANT} \
-                        --target darwin-x64-ota-requestor-${BUILD_VARIANT} \
-                        --target darwin-x64-tv-app-${BUILD_VARIANT} \
-                        build \
-                        --copy-artifacts-to objdir-clone \
-                     "
-            - name: Run Tests
-              timeout-minutes: 60
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                  "./scripts/tests/run_test_suite.py \
-                     --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
-                     --target-skip-glob '{TestGroupMessaging}' \
-                     run \
-                     --iterations 1 \
-                     --test-timeout-seconds 120 \
-                     --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
-                     --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
-                     --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 \
-                  "
+                  mkdir -p /tmp/macos_framework_output
+                  ls -la /Users/runner/work/connectedhomeip/connectedhomeip/src/darwin/Framework/build/Release/
+                  mv /Users/runner/work/connectedhomeip/connectedhomeip/src/darwin/Framework/build/Release/Matter.framework /tmp/macos_framework_output
+                  ls -la /tmp/macos_framework_output
+            # Disabling for now
+            #
+            # - name: Build Apps
+            #   timeout-minutes: 60
+            #   run: |
+            #       ./scripts/run_in_build_env.sh \
+            #          "./scripts/build/build_examples.py \
+            #             --target darwin-x64-darwin-framework-tool-${BUILD_VARIANT} \
+            #             --target darwin-x64-all-clusters-${BUILD_VARIANT} \
+            #             --target darwin-x64-lock-${BUILD_VARIANT} \
+            #             --target darwin-x64-ota-provider-${BUILD_VARIANT} \
+            #             --target darwin-x64-ota-requestor-${BUILD_VARIANT} \
+            #             --target darwin-x64-tv-app-${BUILD_VARIANT} \
+            #             build \
+            #             --copy-artifacts-to objdir-clone \
+            #          "
+            # - name: Run Tests
+            #   timeout-minutes: 60
+            #   run: |
+            #       ./scripts/run_in_build_env.sh \
+            #       "./scripts/tests/run_test_suite.py \
+            #          --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
+            #          --target-skip-glob '{TestGroupMessaging}' \
+            #          run \
+            #          --iterations 1 \
+            #          --test-timeout-seconds 120 \
+            #          --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
+            #          --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
+            #          --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 \
+            #       "
             - name: Uploading core files
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
-                  name:
-                      crash-core-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: crash-core-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: /cores/
                   # Cores are big; don't hold on to them too long.
                   retention-days: 5
             - name: Uploading diagnostic logs
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
-                  name:
-                      crash-log-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: crash-log-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: ~/Library/Logs/DiagnosticReports/
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v2
-              if: ${{ failure() }} && ${{ !env.ACT }}
+              if: ${{ failure() && !env.ACT }}
               with:
-                  name:
-                      crash-objdir-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: crash-objdir-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: objdir-clone/
                   # objdirs are big; don't hold on to them too long.
                   retention-days: 5