Merge commit

.clang-format

@@ -107,129 +107,13 @@ Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never
 ---
-Language:        ObjC
-# BasedOnStyle:  WebKit
-AccessModifierOffset: -4
-AlignAfterOpenBracket: DontAlign
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
-AlignOperands:   false
-AlignTrailingComments: false
-AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: All
-BreakBeforeBraces: WebKit
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeComma
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     132
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: false
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-IndentPPDirectives: None
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 4
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+Language: ObjC
+BasedOnStyle: WebKit
+Standard: c++17
 PointerAlignment: Middle
-ReflowComments:  true
-SortIncludes:    true
-SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        8
-UseTab:          Never
+SpaceInEmptyBlock: false
+ObjCBreakBeforeNestedBlockParam: false
 ---
 Language: JavaScript
 BasedOnStyle: WebKit

.clang-tidy

@@ -10,20 +10,23 @@ Checks: >
   readability-redundant-control-flow,
   readability-redundant-string-cstr,
   readability-redundant-string-init,
-  -bugprone-assignment-in-if-condition,  
+  -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
   -bugprone-copy-constructor-init,
   -bugprone-easily-swappable-parameters,
   -bugprone-forward-declaration-namespace,
   -bugprone-forwarding-reference-overload,
   -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-inc-dec-in-conditions,
   -bugprone-macro-parentheses,
   -bugprone-misplaced-widening-cast,
+  -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
   -bugprone-reserved-identifier,
   -bugprone-signed-char-misuse,
   -bugprone-suspicious-include,
+  -bugprone-switch-missing-default-case,
   -bugprone-undelegated-constructor,
   -bugprone-unused-return-value,
   -clang-analyzer-core.CallAndMessage,

.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 1",
+    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "customizations": {

.github/.wordlist.txt

@@ -298,8 +298,8 @@ connstring
 conntype
 const
 ContentApp
-ContentApp's
 ContentAppPlatform
+ContentApp's
 ContentLaunch
 ContentLauncher
 continuousHinting
@@ -477,6 +477,7 @@ edaf
 edc
 EDR
 ee
+eea
 EEE
 eef
 ef
@@ -659,6 +660,8 @@ ICMP
 IDF
 IDL
 IDLs
+idt
+IDT
 idx
 ifconfig
 ifdef
@@ -789,6 +792,8 @@ LightingApp
 LightingColor
 LightingState
 LinkSoftwareAndDocumentationPack
+lladdr
+LLADDR
 LocalConfigDisabled
 localedef
 localhost
@@ -849,6 +854,7 @@ MDNS
 MediaInput
 MediaPlayback
 MediaTek
+MEI
 mem
 memdf
 MemMonitoring
@@ -925,6 +931,7 @@ nl
 NLUnitTest
 NLUnitTests
 nmcli
+nmtui
 noc
 NodeId
 nongnu
@@ -960,6 +967,7 @@ OnOff
 OnOffClusterTest
 OnOffSwitchConfiguration
 OnPlatformEvent
+onwards
 OO
 openiotsdk
 openjdk
@@ -1019,11 +1027,14 @@ params
 PartNumber
 PASE
 Passcode
+passRetained
+passwd
 PBKDF
 pbuf
 pbufs
 pbxproj
 PCA
+pcap
 pcaps
 PDFs
 PDK
@@ -1041,13 +1052,15 @@ PID
 Pigweed
 PinCode
 pinrequest
+PIXIT
 pkgconfig
 PKI
 plaintext
 PlatformManager
 PlatformManagerImpl
 plt
 png
+Podman
 PollControl
 pollInterval
 polymorphism
@@ -1124,6 +1137,7 @@ ReadConfigValue
 readelf
 readfds
 README
+READMEs
 readonly
 readthedocs
 Reag
@@ -1143,8 +1157,8 @@ REPL
 repo
 req
 Requestor
-Requestor's
 RequestorCanConsent
+Requestor's
 Requestors
 responder
 RestrictedEvent
@@ -1163,6 +1177,7 @@ rootfs
 RPC
 RPCs
 RPi
+RPi's
 RPis
 RSA
 rsn
@@ -1176,9 +1191,11 @@ rtld
 RTOS
 RTT
 RTX
+runArgs
 RUNAS
 RunMain
 runtime
+RVC
 rw
 RXD
 sandboxed
@@ -1196,8 +1213,8 @@ SDB
 SDC
 SDHC
 SDK
-SDK's
 sdkconfig
+SDK's
 SDKs
 SDKTARGETSYSROOT
 sdl
@@ -1274,6 +1291,9 @@ StatusCode
 stderr
 stdout
 sterm
+stlink
+stm
+stmicroelectronics
 storagepath
 str
 strcpy
@@ -1346,6 +1366,7 @@ textboxes
 TFT
 ThermostatUserInterfaceConfiguration
 ThIsIsNoTMyReAlGiThUbToKeNSoDoNoTtRy
+thread
 ThreadNetworkDiagnostics
 threadOperationalDataset
 ThreadStackManager
@@ -1423,6 +1444,7 @@ UnitLocalization
 unpair
 unprovisioned
 Unsecure
+Unselect
 untrusted
 updateAvailable
 updateNotAvailable
@@ -1553,4 +1575,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: Dump disk info
+      uses: ./.github/actions/dump-disk-info
     - name: Checkout submodules
       uses: ./.github/actions/checkout-submodules
       with:
@@ -26,6 +28,18 @@ runs:
       uses: ./.github/actions/bootstrap
       with:
         platform: ${{ inputs.platform }}
+    - name: Remove CIPD cache directory
+      # If there is a bootstrap-cache miss, and bootstrap installs CIPD itself,
+      # there is roughly 1.4GB that remains in this cache that is useless from
+      # this point onwards.
+      shell: bash
+      continue-on-error: true
+      run: |
+        du -sh $HOME/.cipd-cache-dir/
+        rm -rf $HOME/.cipd-cache-dir/ || echo "Removing cipd cache dir failed"
+    - name: Dump disk info after checkout submodule & Bootstrap
+      shell: bash
+      run: scripts/dump_diskspace_info.sh
     - name: Upload Bootstrap Logs
       uses: ./.github/actions/upload-bootstrap-logs
       with:

.github/actions/dump-disk-info/action.yaml

@@ -0,0 +1,20 @@
+name: Dump disk space info
+description: Help debug running out of disk space on github CI
+runs:
+  using: "composite"
+  steps:
+    - name: Collect disk info
+      # Unfortunately current syntax for github wrapper actions only work for
+      # Javascript actions, and Docker container actions, which doesn't make it
+      # possible to wrap a shell script like the one below. The action below
+      # essentially wraps the shell commands we want to run into a Javascript
+      # wrapped action. This allow us to get the disk info usage before a job
+      # is run and after the job is run regardless if the job succeeds or
+      # fails.
+      uses: pyTooling/Actions/[email protected]
+      if: ${{ runner.os == 'Linux' }}
+      with:
+        main: |-
+          exec ./scripts/dump_diskspace_info.sh
+        post: |-
+          exec ./scripts/dump_diskspace_info.sh