Skip to content

Commit a629150

Browse files
authored
Merge branch 'master' into remove_PICS_from_ICDM_tests
2 parents fa944cd + a3a443a commit a629150

File tree

4,072 files changed

+469290
-436656
lines changed

Some content is hidden

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

4,072 files changed

+469290
-436656
lines changed

.clang-tidy

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Checks: >
2424
-bugprone-multi-level-implicit-pointer-conversion,
2525
-bugprone-narrowing-conversions,
2626
-bugprone-not-null-terminated-result,
27+
-bugprone-pointer-arithmetic-on-polymorphic-object,
2728
-bugprone-reserved-identifier,
2829
-bugprone-signed-char-misuse,
2930
-bugprone-suspicious-include,
@@ -45,6 +46,7 @@ Checks: >
4546
-clang-analyzer-security.insecureAPI.rand,
4647
-clang-analyzer-security.insecureAPI.strcpy,
4748
-clang-analyzer-unix.Malloc,
48-
-clang-diagnostic-implicit-int-conversion
49+
-clang-diagnostic-implicit-int-conversion,
50+
-clang-diagnostic-missing-template-arg-list-after-template-kw
4951
WarningsAsErrors: '*'
5052
HeaderFilterRegex: '(src|examples|zzz_generated|credentials).*(?<!third_party.*repo)'

.devcontainer/Dockerfile

+38-17
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,27 @@ ARG USER_UID=1000
2424
ARG USER_GID=$USER_UID
2525
ENV LANG en_US.utf8
2626

27-
# these are installed for terminal/dev convenience. If more tooling for build is required, please
28-
# add them to chip-build (in integrations/docker/images/chip-build)
27+
28+
# These are installed for terminal/dev convenience. If more tooling for build is required, please
29+
# add them to chip-build (in integrations/docker/images/chip-build).
2930
RUN apt-get update \
3031
&& apt-get install -y locales \
3132
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
32-
&& apt-get -fy install git vim emacs sudo \
33+
&& apt-get -fy install vim emacs sudo \
3334
apt-utils dialog zsh \
34-
iproute2 procps lsb-release \
35+
lsb-release \
3536
bash-completion \
36-
build-essential cmake cppcheck valgrind \
37-
wget curl telnet \
37+
valgrind \
3838
docker.io \
39-
iputils-ping net-tools \
40-
libncurses5 \
41-
libncursesw5 \
42-
libpython2.7 \
39+
iputils-ping \
40+
icecc \
4341
&& :
4442

45-
RUN groupadd -g $USER_GID $USERNAME \
43+
RUN (getent passwd $USER_UID && userdel -f $(getent passwd $USER_UID | cut -d: -f1) || true) \
44+
&& (getent group $USER_GID && groupdel -f $(getent group $USER_GID | cut -d: -f1) || true) \
45+
&& (getent passwd $USERNAME && userdel -f $USERNAME || true) \
46+
&& (getent group $USERNAME && groupdel -f $USERNAME || true) \
47+
&& groupadd -g $USER_GID $USERNAME \
4648
&& useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
4749
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
4850
&& chmod 0440 /etc/sudoers.d/$USERNAME \
@@ -55,13 +57,22 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5557
RUN mkdir -p /opt/sdk/sdks/ \
5658
&& chown -R $USERNAME:$USERNAME \
5759
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
58-
/opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
59-
$IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
60+
$ANDROID_HOME \
61+
$IDF_TOOLS_PATH \
62+
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
63+
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
64+
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
65+
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
66+
&& chmod -R +x \
67+
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
68+
&& chmod -R +w \
6069
$IDF_TOOLS_PATH \
61-
$SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
62-
$ANDROID_HOME `# allow licenses to be accepted` \
63-
$AMEBA_PATH `# AmebaD requires access to change build_info.h` \
64-
$IMX_SDK_ROOT \
70+
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
71+
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
72+
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
73+
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
74+
# Safe directory is preffered over chown.
75+
&& git config --global --add safe.directory "*" \
6576
&& :
6677

6778
# Fix Tizen SDK paths for new user
@@ -74,3 +85,13 @@ ENV TIZEN_ROOTFS /tizen_rootfs
7485

7586
# Fast Model GDB plugins path for debugging support
7687
ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
88+
89+
# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
90+
# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
91+
# from compilation caching and distributed compilation at the same time.
92+
#
93+
# NOTE: In order to use distributed compilation with icecc, one should run
94+
# "scripts/icecc.sh start" before starting the build.
95+
ENV CHIP_PW_COMMAND_LAUNCHER ccache
96+
ENV CCACHE_PREFIX icecc
97+
ENV PATH /usr/lib/ccache:$PATH

.devcontainer/devcontainer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
"mounts": [
1515
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
1616
],
17-
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
17+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
20+
"containerEnv": {
21+
"PW_ENVIRONMENT_ROOT": "${containerWorkspaceFolder}/.environment-vscode"
22+
},
2023
"customizations": {
2124
"vscode": {
2225
// Add the IDs of extensions you want installed when the container is created in the array below.

.github/.wordlist.txt

+33-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ AdvSendAdvert
3737
AE
3838
aef
3939
AES
40+
AFL
4041
AIDL
4142
algs
4243
alloc
44+
allocator
45+
allocators
46+
Ambrose
4347
Ameba
4448
amebad
4549
amebaiot
@@ -316,6 +320,7 @@ cryptographic
316320
CSA
317321
csg
318322
csrrequest
323+
cstdint
319324
csu
320325
csv
321326
ctl
@@ -340,6 +345,7 @@ datamodel
340345
DataModelRevision
341346
dataset
342347
datasets
348+
datastore
343349
DataVersion
344350
dbf
345351
DBG
@@ -438,6 +444,7 @@ DNSStubListener
438444
docbuild
439445
Dockerfile
440446
Dockerfiles
447+
docstrings
441448
Don'ts
442449
DoorLock
443450
DoorState
@@ -451,13 +458,16 @@ dpkg
451458
dropdown
452459
dryrun
453460
DS
461+
DSLS
454462
duplicative
455463
DUT
456464
DUTS
465+
DUT's
457466
DV
458467
DVK
459468
dynload
460469
eabi
470+
EAF
461471
EB
462472
ECC
463473
ECD
@@ -548,6 +558,7 @@ feff
548558
ffaa
549559
ffeebaefa
550560
FFF
561+
FFFFFFFFFFFF0102
551562
fffe
552563
fffff
553564
Fi
@@ -559,15 +570,20 @@ FlowMeasurement
559570
FluorideConcentrationMeasurement
560571
focusable
561572
forkpty
573+
formatter
574+
formatters
562575
FOTA
563576
FreeRTOS
564577
FreeRTOSConfig
578+
FS
565579
fsl
566580
fstab
567581
fsync
568582
ftd
569583
fullclean
570584
fuzzer
585+
fuzzers
586+
fuzztest
571587
FW
572588
gbl
573589
gcloud
@@ -722,10 +738,12 @@ IPython
722738
ISCAN
723739
isHexString
724740
isLowerCase
741+
isort
725742
isUpperCase
726743
itemName
727744
iterable
728745
itsfoss
746+
IW
729747
JDK
730748
jinja
731749
JLink
@@ -854,6 +872,7 @@ MbedNewTarget
854872
mbedos
855873
mbedTarget
856874
mbedTLS
875+
MCORE
857876
mcu
858877
MCUboot
859878
mcumgr
@@ -867,6 +886,7 @@ MediaPlayback
867886
MediaTek
868887
MEI
869888
mem
889+
memcpy
870890
memdf
871891
MemMonitoring
872892
menuconfig
@@ -883,6 +903,7 @@ microcontroller
883903
microcontrollers
884904
MicroSD
885905
middleware
906+
MIMXRT
886907
minApplicableSoftwareVersion
887908
Minicom
888909
MinInterval
@@ -914,12 +935,14 @@ Multicast
914935
multilib
915936
Multiprotocol
916937
multithreaded
938+
Murata
917939
mutex
918940
mutexes
919941
mv
920942
MX
921943
mydir
922944
MyPASSWORD
945+
mypy
923946
MySSID
924947
NAMESERVER
925948
NAMESPACE
@@ -945,8 +968,6 @@ NitricOxideConcentrationMeasurement
945968
NitrogenDioxideConcentrationMeasurement
946969
nl
947970
nltest
948-
NLUnitTest
949-
NLUnitTests
950971
nmcli
951972
nmtui
952973
noc
@@ -998,13 +1019,15 @@ OpenThreadDemo
9981019
openweave
9991020
OperationalCredentials
10001021
operationalDataset
1022+
operationalstate
10011023
opkg
10021024
OPTIGA
10031025
optionMask
10041026
optionOverride
10051027
optionsMask
10061028
optionsOverride
10071029
orgs
1030+
OSS
10081031
OTA
10091032
OTADownloader
10101033
otaDownloadPath
@@ -1172,6 +1195,7 @@ rebase
11721195
recommand
11731196
recommanded
11741197
recurse
1198+
refrigeratoralarm
11751199
regen
11761200
registerAttributeAccessOverride
11771201
RegisterCommandHandler
@@ -1429,6 +1453,7 @@ toJson
14291453
tokenization
14301454
tokenized
14311455
tokenizer
1456+
toml
14321457
toolchain
14331458
toolchains
14341459
topologies
@@ -1442,6 +1467,8 @@ trackFree
14421467
TransferSession
14431468
transitionTime
14441469
TransportMgrBase
1470+
triaged
1471+
triaging
14451472
TriggerEffect
14461473
TRNG
14471474
trustm
@@ -1527,6 +1554,7 @@ virtualenv
15271554
visualstudio
15281555
vlatest
15291556
VLEDs
1557+
vm
15301558
vn
15311559
vnc
15321560
vous
@@ -1593,6 +1621,7 @@ xFFF
15931621
xFFFF
15941622
xfffff
15951623
xFFFFFFEFFFFFFFFF
1624+
XMLPICSValidator
15961625
xtensa
15971626
xvzf
15981627
xwayland
@@ -1619,3 +1648,5 @@ zhengyaohan
16191648
Zigbee
16201649
zigbeealliance
16211650
zigbeethread
1651+
zsdk
1652+
TBR

.github/CODEOWNERS

-2
This file was deleted.

.github/issue-labeler.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,18 @@ darwin:
1212
# (?![a-z]) means "there is no next char in the range a-z".
1313
- "/(\\b[Ii][Oo][Ss](?![a-zA-Z])|[Hh][Oo][Mm][Ee][Pp][Oo][Dd]|[Dd][Aa][Rr][Ww][Ii][Nn]|\\bm[Aa][Cc]\\b|\\bMa[Cc]\\b|\\bM[Aa]c\\b|[Mm][Aa][Cc][Oo][Ss])/"
1414

15-
linux:
16-
- "/(linux)/i"
15+
16+
# NOTE:
17+
# Linux intentionally disabled: most people compile either on linux or darwin and
18+
# as a result a lot of issues get tagged as such even though they are not platform specific
19+
# (e.g. we get test case failures reported as linux even though they are just normal
20+
# test runs)
21+
#
22+
# Linux label should be reserved to platform-specific problems (usually bootstrap/packages
23+
# or integration with wifi/ethernet/bluetootn/etc.)
24+
#
25+
# linux:
26+
# - "/(linux)/i"
1727

1828
# Special Keywords for Cert Blockers
1929
air purifiers:

0 commit comments

Comments
 (0)