Merge branch 'master' into rjosefsen/update-occupancy-sensing-revision

Author: ReneJosefsen

.clang-tidy

@@ -35,6 +35,7 @@ Checks: >
   -clang-analyzer-cplusplus.Move,
   -clang-analyzer-deadcode.DeadStores,
   -clang-analyzer-nullability.NullablePassedToNonnull,
+  -clang-analyzer-optin.core.EnumCastOutOfRange,
   -clang-analyzer-optin.cplusplus.UninitializedObject,
   -clang-analyzer-optin.cplusplus.VirtualCall,
   -clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,

.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
+    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "customizations": {

.github/.wordlist.txt

@@ -14,29 +14,19 @@ abfb
 ABI
 ABIs
 ables
-AccessControl
-AccessControlEntry
+accesscontrol
 accessor
 Accessors
-AccountLogin
 acdbc
 ack
 ACKed
 ACL
 ACLs
 actdiag
-AdapterAddress
-AdapterName
 adb
 AddNOC
-AddOrUpdateThreadNetwork
-AddOrUpdateWiFiNetwork
 addr
-AddResponse
-AddThreadNetwork
-AddStatus
 adk
-AdministratorCommissioning
 adoc
 adr
 AdvAutonomous
@@ -48,7 +38,6 @@ AE
 aef
 AES
 AIDL
-AlarmCode
 algs
 alloc
 Ameba
@@ -61,15 +50,12 @@ AnnounceOTAProvider
 AnnounceOTAProviderRequest
 APIs
 apk
-AppConfig
 AppImpl
 AppleTV
 appliable
-ApplianceControl
 applianceeventsandalert
 ApplianceIdentification
 appliancestatistics
-ApplicationBasic
 ApplicationId
 ApplicationIdentifier
 ApplicationLauncher
@@ -171,7 +157,6 @@ BRD
 breakpoint
 bredr
 BridgedDeviceBasicInformation
-bridgedLightEndpoint
 bringup
 BroadcastReceiver
 BromateConcentrationMeasurement
@@ -259,9 +244,6 @@ CLIs
 cloudbuild
 CLRF
 clusterAttrs
-clusterId
-clusterList
-clusterListName
 ClusterName
 ClusterObjectTests
 ClusterRevision
@@ -315,7 +297,6 @@ ContentApp's
 ContentAppPlatform
 ContentLaunch
 ContentLauncher
-continuousHinting
 contrib
 controllee
 conv
@@ -382,7 +363,6 @@ DefaultOTARequestor
 DefaultOTARequestorDriver
 DefaultOTARequestorStorage
 DefaultSuccess
-defaultValue
 definedValue
 DehumidificationControl
 DelayedActionTime
@@ -415,9 +395,7 @@ DeviceLayer
 DeviceNetworkProvisioningDelegate
 DeviceNetworkProvisioningDelegateImpl
 DevicePairingDelegate
-deviceSoftwareVersionModel
 DeviceTemperatureConfiguration
-deviceType
 DevKitC
 DevKitM
 devtype
@@ -511,8 +489,6 @@ EnableNetwork
 EnableWiFiNetwork
 endian
 EndpointId
-endpointName
-endsWith
 eno
 entrypoint
 enum
@@ -523,6 +499,7 @@ epochStartTime
 eq
 errorValue
 esd
+espcoredump
 ESPPORT
 Espressif
 esptool
@@ -579,7 +556,6 @@ FlowMeasurement
 FluorideConcentrationMeasurement
 focusable
 forkpty
-formatOnSave
 FOTA
 FreeRTOS
 FreeRTOSConfig
@@ -613,7 +589,6 @@ GetIP
 getManualTests
 GetSafeAttributePersistenceProvider
 getstarted
-getTests
 GH
 ghcr
 ghp
@@ -638,8 +613,6 @@ graphviz
 Groupcast
 GroupId
 GroupKeyManagement
-groupKeySecurityPolicy
-groupKeySetID
 groupsettings
 gsdk
 gtk
@@ -693,8 +666,6 @@ ifconfig
 ifdef
 ifdefs
 IGMP
-ignoreApplyUpdate
-ignoreQueryImage
 ihex
 IlluminanceMeasurement
 IM
@@ -1621,4 +1592,4 @@ zephyrproject
 zhengyaohan
 Zigbee
 zigbeealliance
-zigbeethread
+zigbeethread

.github/actions/checkout-submodules-and-bootstrap/action.yaml

@@ -15,6 +15,8 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Maximize runner disk
+      uses: ./.github/actions/maximize-runner-disk
     - name: Dump disk info
       uses: ./.github/actions/dump-disk-info
     - name: Set git safe directory for local act runs

.github/actions/maximize-runner-disk/action.yaml

@@ -0,0 +1,50 @@
+name: Maximize runner disk
+description: Free up disk space on the github runner
+runs:
+  using: "composite"
+  steps:
+    - name: Free up disk space on the github runner
+      if: ${{ !env.ACT }}
+      shell: bash
+      run: |
+        # maximize-runner-disk
+        if [[ "$RUNNER_OS" == Linux ]]; then
+          # Directories to prune to free up space. Candidates:
+          #   1.6G  /usr/share/dotnet
+          #   1.1G  /usr/local/lib/android/sdk/platforms
+          #   1000M /usr/local/lib/android/sdk/build-tools
+          #   8.9G  /usr/local/lib/android/sdk
+          # This list can be amended later to change the trade-off between the amount of
+          # disk space freed up, and how long it takes to do so (deleting many files is slow).
+          prune=(/usr/share/dotnet /usr/local/lib/android/sdk/platforms /usr/local/lib/android/sdk/build-tools)
+
+          if [[ "$UID" -eq 0 && -d /__w ]]; then
+            root=/runner-root-volume
+            if [[ ! -d "$root" ]]; then
+              echo "Unable to maximize disk space, job is running inside a container and $root is not mounted"
+              exit 0
+            fi
+            function sudo() { "$@"; } # we're already root (and sudo is probably unavailable)
+          elif [[ "$UID" -ne 0 && "$RUNNER_ENVIRONMENT" == github-hosted ]]; then
+            root=
+          else
+            echo "Unable to maximize disk space, unknown runner environment"
+            exit 0
+          fi
+
+          echo "Freeing up runner disk space on ${root:-/}"
+          function avail() { df -k --output=avail "${root:-/}" | grep '^[0-9]*$'; }
+          function now() { date '+%s'; }
+          before="$(avail)" start="$(now)"
+          for dir in "${prune[@]}"; do
+            if [[ -d "${root}${dir}" ]]; then
+              echo "- $dir"
+              # du -sh -- "${root}${dir}"
+              sudo rm -rf -- "${root}${dir}"
+            else
+              echo "- $dir (not found)"
+            fi
+          done
+          after="$(avail)" end="$(now)"
+          echo "Done, freed up $(( (after - before) / 1024 ))M of disk space in $(( end - start )) seconds."
+        fi

.github/workflows/bloat_check.yaml

@@ -33,7 +33,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
 
         steps:
             - name: Checkout

.github/workflows/build.yaml

@@ -40,8 +40,9 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
+                - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -135,8 +136,9 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
+                - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -283,8 +285,9 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
+                - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -343,8 +346,9 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
+                - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -451,8 +455,9 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
+                - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

.github/workflows/chef.yaml

@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             options: --user root
 
         steps:
@@ -54,7 +54,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:32
+            image: ghcr.io/project-chip/chip-build-esp32:35
             options: --user root
 
         steps:
@@ -75,7 +75,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:32
+            image: ghcr.io/project-chip/chip-build-nrf-platform:35
             options: --user root
 
         steps:
@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:32
+            image: ghcr.io/project-chip/chip-build-telink:35
             options: --user root
 
         steps:
@@ -108,7 +108,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
             - name: CI Examples Telink
               shell: bash
               run: |

.github/workflows/cherry-picks.yaml

@@ -14,7 +14,6 @@ jobs:
             (github.event.pull_request.merged == true)
             && (
                    (contains(github.event.pull_request.labels.*.name, 'sve'))
-               ||  (contains(github.event.pull_request.labels.*.name, 'spec'))
                ||  (contains(github.event.pull_request.labels.*.name, 'request sve'))
                ||  (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
             )
@@ -27,11 +26,12 @@ jobs:
               uses: carloscastrojumo/github-cherry-pick-action@v1.0.9
               with:
                   token: ${{ secrets.MATTER_PAT }}
-                  branch: sve-2
+                  branch: 1.3-sve
                   labels: |
                       sve cherry pick
                   reviewers: |
                       woody-apple
                       andy31415
+                      raju-apple
 env:
     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cirque.yaml

@@ -40,7 +40,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: ghcr.io/project-chip/chip-build-cirque:32
+        #             image: ghcr.io/project-chip/chip-build-cirque:35
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
@@ -71,7 +71,7 @@ jobs:
             - name: Get Cirque Bootstrap cache key
               id: cirque-bootstrap-cache-key
               run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
-            - uses: Wandalen/wretry.action@v1.3.0
+            - uses: Wandalen/wretry.action@v1.4.4
               name: Cirque Bootstrap cache
               if: ${{ !env.ACT }}
               continue-on-error: true