Skip to content

Commit 73f9801

Browse files
Merge branch 'master' into idm-4.2-troubleshoot
2 parents 53c1002 + 3edfb9c commit 73f9801

File tree

459 files changed

+16999
-2737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

459 files changed

+16999
-2737
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"mounts": [
1515
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
1616
],
17-
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
17+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
2020
"customizations": {

.github/.wordlist.txt

+3-32
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,19 @@ abfb
1414
ABI
1515
ABIs
1616
ables
17-
AccessControl
18-
AccessControlEntry
17+
accesscontrol
1918
accessor
2019
Accessors
21-
AccountLogin
2220
acdbc
2321
ack
2422
ACKed
2523
ACL
2624
ACLs
2725
actdiag
28-
AdapterAddress
29-
AdapterName
3026
adb
3127
AddNOC
32-
AddOrUpdateThreadNetwork
33-
AddOrUpdateWiFiNetwork
3428
addr
35-
AddResponse
36-
AddThreadNetwork
37-
AddStatus
3829
adk
39-
AdministratorCommissioning
4030
adoc
4131
adr
4232
AdvAutonomous
@@ -48,7 +38,6 @@ AE
4838
aef
4939
AES
5040
AIDL
51-
AlarmCode
5241
algs
5342
alloc
5443
Ameba
@@ -61,15 +50,12 @@ AnnounceOTAProvider
6150
AnnounceOTAProviderRequest
6251
APIs
6352
apk
64-
AppConfig
6553
AppImpl
6654
AppleTV
6755
appliable
68-
ApplianceControl
6956
applianceeventsandalert
7057
ApplianceIdentification
7158
appliancestatistics
72-
ApplicationBasic
7359
ApplicationId
7460
ApplicationIdentifier
7561
ApplicationLauncher
@@ -171,7 +157,6 @@ BRD
171157
breakpoint
172158
bredr
173159
BridgedDeviceBasicInformation
174-
bridgedLightEndpoint
175160
bringup
176161
BroadcastReceiver
177162
BromateConcentrationMeasurement
@@ -259,9 +244,6 @@ CLIs
259244
cloudbuild
260245
CLRF
261246
clusterAttrs
262-
clusterId
263-
clusterList
264-
clusterListName
265247
ClusterName
266248
ClusterObjectTests
267249
ClusterRevision
@@ -315,7 +297,6 @@ ContentApp's
315297
ContentAppPlatform
316298
ContentLaunch
317299
ContentLauncher
318-
continuousHinting
319300
contrib
320301
controllee
321302
conv
@@ -382,7 +363,6 @@ DefaultOTARequestor
382363
DefaultOTARequestorDriver
383364
DefaultOTARequestorStorage
384365
DefaultSuccess
385-
defaultValue
386366
definedValue
387367
DehumidificationControl
388368
DelayedActionTime
@@ -415,9 +395,7 @@ DeviceLayer
415395
DeviceNetworkProvisioningDelegate
416396
DeviceNetworkProvisioningDelegateImpl
417397
DevicePairingDelegate
418-
deviceSoftwareVersionModel
419398
DeviceTemperatureConfiguration
420-
deviceType
421399
DevKitC
422400
DevKitM
423401
devtype
@@ -511,8 +489,6 @@ EnableNetwork
511489
EnableWiFiNetwork
512490
endian
513491
EndpointId
514-
endpointName
515-
endsWith
516492
eno
517493
entrypoint
518494
enum
@@ -523,6 +499,7 @@ epochStartTime
523499
eq
524500
errorValue
525501
esd
502+
espcoredump
526503
ESPPORT
527504
Espressif
528505
esptool
@@ -579,7 +556,6 @@ FlowMeasurement
579556
FluorideConcentrationMeasurement
580557
focusable
581558
forkpty
582-
formatOnSave
583559
FOTA
584560
FreeRTOS
585561
FreeRTOSConfig
@@ -613,7 +589,6 @@ GetIP
613589
getManualTests
614590
GetSafeAttributePersistenceProvider
615591
getstarted
616-
getTests
617592
GH
618593
ghcr
619594
ghp
@@ -638,8 +613,6 @@ graphviz
638613
Groupcast
639614
GroupId
640615
GroupKeyManagement
641-
groupKeySecurityPolicy
642-
groupKeySetID
643616
groupsettings
644617
gsdk
645618
gtk
@@ -693,8 +666,6 @@ ifconfig
693666
ifdef
694667
ifdefs
695668
IGMP
696-
ignoreApplyUpdate
697-
ignoreQueryImage
698669
ihex
699670
IlluminanceMeasurement
700671
IM
@@ -1621,4 +1592,4 @@ zephyrproject
16211592
zhengyaohan
16221593
Zigbee
16231594
zigbeealliance
1624-
zigbeethread
1595+
zigbeethread

.github/workflows/cherry-picks.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
(github.event.pull_request.merged == true)
1515
&& (
1616
(contains(github.event.pull_request.labels.*.name, 'sve'))
17-
|| (contains(github.event.pull_request.labels.*.name, 'spec'))
1817
|| (contains(github.event.pull_request.labels.*.name, 'request sve'))
1918
|| (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
2019
)
@@ -27,11 +26,12 @@ jobs:
2726
uses: carloscastrojumo/github-cherry-pick-action@v1.0.9
2827
with:
2928
token: ${{ secrets.MATTER_PAT }}
30-
branch: sve-2
29+
branch: 1.3-sve
3130
labels: |
3231
sve cherry pick
3332
reviewers: |
3433
woody-apple
3534
andy31415
35+
raju-apple
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
--target darwin-x64-bridge-${BUILD_VARIANT} \
101101
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
102102
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
103+
--target darwin-x64-rvc-${BUILD_VARIANT} \
103104
build \
104105
--copy-artifacts-to objdir-clone \
105106
"
@@ -120,6 +121,7 @@ jobs:
120121
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
121122
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
122123
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
124+
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
123125
"
124126
- name: Run OTA Test
125127
run: |

.github/workflows/lint.yml

-20
Original file line numberDiff line numberDiff line change
@@ -93,35 +93,20 @@ jobs:
9393
--known-failure app/AttributeAccessInterface.h \
9494
--known-failure app/AttributeAccessToken.h \
9595
--known-failure app/att-storage.h \
96-
--known-failure app/BufferedReadCallback.h \
9796
--known-failure app/CommandHandler.h \
9897
--known-failure app/CommandHandlerInterface.h \
99-
--known-failure app/CommandPathParams.h \
100-
--known-failure app/CommandPathRegistry.h \
101-
--known-failure app/CommandResponseSender.h \
102-
--known-failure app/CommandSender.h \
10398
--known-failure app/CommandSenderLegacyCallback.h \
10499
--known-failure app/CompatEnumNames.h \
105-
--known-failure app/ConcreteAttributePath.h \
106-
--known-failure app/ConcreteCommandPath.h \
107100
--known-failure app/data-model/ListLargeSystemExtensions.h \
108101
--known-failure app/EventHeader.h \
109-
--known-failure app/EventLoggingDelegate.h \
110-
--known-failure app/EventLogging.h \
111102
--known-failure app/EventLoggingTypes.h \
112-
--known-failure app/EventManagement.h \
113-
--known-failure app/InteractionModelHelper.h \
114-
--known-failure app/ObjectList.h \
115-
--known-failure app/ReadClient.h \
116103
--known-failure app/ReadHandler.h \
117104
--known-failure app/ReadPrepareParams.h \
118105
--known-failure app/reporting/tests/MockReportScheduler.cpp \
119106
--known-failure app/reporting/tests/MockReportScheduler.h \
120-
--known-failure app/server/AppDelegate.h \
121107
--known-failure app/TestEventTriggerDelegate.h \
122108
--known-failure app/util/af.h \
123109
--known-failure app/util/af-types.h \
124-
--known-failure app/util/attribute-metadata.h \
125110
--known-failure app/util/attribute-storage.cpp \
126111
--known-failure app/util/attribute-storage.h \
127112
--known-failure app/util/attribute-storage-null-handling.h \
@@ -141,14 +126,9 @@ jobs:
141126
--known-failure app/util/im-client-callbacks.h \
142127
--known-failure app/util/MatterCallbacks.h \
143128
--known-failure app/util/message.cpp \
144-
--known-failure app/util/mock/Constants.h \
145-
--known-failure app/util/mock/Functions.h \
146-
--known-failure app/util/mock/MockNodeConfig.h \
147129
--known-failure app/util/odd-sized-integers.h \
148-
--known-failure app/util/types_stub.h \
149130
--known-failure app/util/util.cpp \
150131
--known-failure app/util/util.h \
151-
--known-failure app/WriteClient.h \
152132
--known-failure app/WriteHandler.h \
153133
--known-failure lib/core/CHIPVendorIdentifiers.hpp \
154134
--known-failure platform/DeviceSafeQueue.cpp \

.github/workflows/spell.yml

+11-10
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,20 @@ on:
2525
- ".github/.wordlist.txt"
2626

2727
jobs:
28-
check-reviewdog:
29-
name: Check Spelling - reviewdog
30-
runs-on: ubuntu-latest
31-
steps:
32-
- name: Checkout
33-
uses: actions/checkout@v4
34-
- uses: reviewdog/action-misspell@v1
35-
with:
36-
github_token: ${{ secrets.GITHUB_TOKEN }}
28+
# Seems redundant; removed as pyspelling is customized while this is not
29+
# check-reviewdog:
30+
# name: Check Spelling - reviewdog
31+
# runs-on: ubuntu-latest
32+
# steps:
33+
# - name: Checkout
34+
# uses: actions/checkout@v4
35+
# - uses: reviewdog/action-misspell@v1
36+
# with:
37+
# github_token: ${{ secrets.GITHUB_TOKEN }}
3738
check-spellcheck:
3839
name: Check Spelling - pyspelling
3940
runs-on: ubuntu-latest
4041
steps:
4142
- name: Checkout
4243
uses: actions/checkout@v4
43-
- uses: igsekor/pyspelling-any@v1.0.4
44+
- uses: rojopolis/spellcheck-github-actions@0.36.0

0 commit comments

Comments
 (0)