Skip to content

Commit 2b4c066

Browse files
Merge branch 'master' of https://github.com/project-chip/connectedhomeip into TC-SC-4.3-python-test
2 parents 2ac1049 + 0d17a40 commit 2b4c066

File tree

3,325 files changed

+371930
-271333
lines changed

Some content is hidden

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

3,325 files changed

+371930
-271333
lines changed

.devcontainer/Dockerfile

+23-17
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,23 @@ 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 \
4340
&& :
4441

4542
RUN groupadd -g $USER_GID $USERNAME \
46-
&& useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
43+
&& useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
4744
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
4845
&& chmod 0440 /etc/sudoers.d/$USERNAME \
4946
&& :
@@ -55,13 +52,22 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5552
RUN mkdir -p /opt/sdk/sdks/ \
5653
&& chown -R $USERNAME:$USERNAME \
5754
/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` \
55+
$ANDROID_HOME \
56+
$IDF_TOOLS_PATH \
57+
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
58+
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
59+
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
60+
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
61+
&& chmod -R +x \
62+
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
63+
&& chmod -R +w \
6064
$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 \
65+
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
66+
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
67+
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
68+
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
69+
# Safe directory is preffered over chown.
70+
&& git config --global --add safe.directory "*" \
6571
&& :
6672

6773
# Fix Tizen SDK paths for new user

.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

+14-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ AdvSendAdvert
3737
AE
3838
aef
3939
AES
40+
AFL
4041
AIDL
4142
algs
4243
alloc
@@ -340,6 +341,7 @@ datamodel
340341
DataModelRevision
341342
dataset
342343
datasets
344+
datastore
343345
DataVersion
344346
dbf
345347
DBG
@@ -402,6 +404,7 @@ DevKitM
402404
devtype
403405
df
404406
dfe
407+
DFILE
405408
dfu
406409
DgDxsfHx
407410
dhclient
@@ -450,9 +453,11 @@ dpkg
450453
dropdown
451454
dryrun
452455
DS
456+
DSLS
453457
duplicative
454458
DUT
455459
DUTS
460+
DUT's
456461
DV
457462
DVK
458463
dynload
@@ -561,12 +566,15 @@ forkpty
561566
FOTA
562567
FreeRTOS
563568
FreeRTOSConfig
569+
FS
564570
fsl
565571
fstab
566572
fsync
567573
ftd
568574
fullclean
569575
fuzzer
576+
fuzzers
577+
fuzztest
570578
FW
571579
gbl
572580
gcloud
@@ -649,6 +657,7 @@ href
649657
HSM
650658
hsm
651659
HTTPS
660+
Humidistat
652661
HW
653662
hwadr
654663
HydrogenConcentrationMeasurement
@@ -852,6 +861,7 @@ MbedNewTarget
852861
mbedos
853862
mbedTarget
854863
mbedTLS
864+
MCORE
855865
mcu
856866
MCUboot
857867
mcumgr
@@ -943,8 +953,6 @@ NitricOxideConcentrationMeasurement
943953
NitrogenDioxideConcentrationMeasurement
944954
nl
945955
nltest
946-
NLUnitTest
947-
NLUnitTests
948956
nmcli
949957
nmtui
950958
noc
@@ -1003,6 +1011,7 @@ optionOverride
10031011
optionsMask
10041012
optionsOverride
10051013
orgs
1014+
OSS
10061015
OTA
10071016
OTADownloader
10081017
otaDownloadPath
@@ -1354,6 +1363,7 @@ SVR
13541363
SWD
13551364
SWU
13561365
symlinks
1366+
sysbuild
13571367
sysconfdir
13581368
SysConfig
13591369
sysctl
@@ -1524,6 +1534,7 @@ virtualenv
15241534
visualstudio
15251535
vlatest
15261536
VLEDs
1537+
vm
15271538
vn
15281539
vnc
15291540
vous
@@ -1616,3 +1627,4 @@ zhengyaohan
16161627
Zigbee
16171628
zigbeealliance
16181629
zigbeethread
1630+
zsdk

.github/dependabot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ updates:
5454
- dependency-name: "third_party/open-iot-sdk/repo"
5555
- dependency-name: "third_party/ot-br-posix/repo"
5656
- dependency-name: "third_party/perfetto/repo"
57-
- dependency-name: "third_party/pybind11/repo"
5857
- dependency-name: "third_party/qpg_sdk/repo"
5958
- dependency-name: "third_party/silabs/repo"
6059
- dependency-name: "third_party/simw-top-mini/repo"

.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

.github/stale.yml

-42
This file was deleted.

.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:65
37+
image: ghcr.io/project-chip/chip-build:77
3838

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

+16-15
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:65
45+
image: ghcr.io/project-chip/chip-build:77
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
languages: "cpp"
7777
- name: Setup Build
78-
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
78+
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false chip_data_model_check_die_on_failure=true"
7979
- name: Run Build
8080
run: scripts/run_in_build_env.sh "ninja -C ./out"
8181
- name: Run Tests
@@ -138,7 +138,7 @@ jobs:
138138
if: github.actor != 'restyled-io[bot]'
139139

140140
container:
141-
image: ghcr.io/project-chip/chip-build:54
141+
image: ghcr.io/project-chip/chip-build:77
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -179,7 +179,7 @@ jobs:
179179
scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
180180
- name: Setup Build, Run Build and Run Tests
181181
run: |
182-
BUILD_TYPE=gcc_release scripts/build/gn_gen.sh --args="is_debug=false"
182+
BUILD_TYPE=gcc_release scripts/build/gn_gen.sh --args="is_debug=false chip_data_model_check_die_on_failure=true"
183183
scripts/run_in_build_env.sh "ninja -C ./out/gcc_release"
184184
BUILD_TYPE=gcc_release scripts/tests/gn_tests.sh
185185
- name: Clean output
@@ -197,7 +197,7 @@ jobs:
197197
esac
198198
199199
rm -rf ./out/sanitizers
200-
BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
200+
BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --export-compile-commands
201201
BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
202202
done
203203
- name: Ensure codegen is done for sanitize
@@ -283,7 +283,7 @@ jobs:
283283
if: github.actor != 'restyled-io[bot]'
284284

285285
container:
286-
image: ghcr.io/project-chip/chip-build:54
286+
image: ghcr.io/project-chip/chip-build:77
287287
volumes:
288288
- "/:/runner-root-volume"
289289
- "/tmp/log_output:/tmp/test_logs"
@@ -308,17 +308,18 @@ jobs:
308308

309309
- name: Setup Build, Run Build and Run Tests
310310
run: |
311-
scripts/build/gn_gen.sh --args="enable_rtti=true enable_pylib=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
311+
scripts/build/gn_gen.sh --args="enable_rtti=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false chip_data_model_check_die_on_failure=true"
312312
scripts/run_in_build_env.sh "ninja -C ./out"
313313
scripts/tests/gn_tests.sh
314314
- name: Setup test python environment
315315
shell: bash
316316
run: |
317317
scripts/run_in_build_env.sh 'virtualenv pyenv'
318318
source pyenv/bin/activate
319-
pip3 install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl
320-
pip3 install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl
321-
pip3 install ./out/controller/python/chip_repl-0.0-py3-none-any.whl
319+
python -m ensurepip --upgrade
320+
python -m pip install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl
321+
python -m pip install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl
322+
python -m pip install ./out/controller/python/chip_repl-0.0-py3-none-any.whl
322323
323324
- name: Run Python tests
324325
shell: bash
@@ -334,7 +335,8 @@ jobs:
334335
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
335336
scripts/run_in_build_env.sh 'virtualenv pyenv'
336337
source pyenv/bin/activate
337-
pip3 install -r scripts/setup/requirements.setuppayload.txt
338+
python -m ensurepip --upgrade
339+
python -m pip install -r scripts/setup/requirements.setuppayload.txt
338340
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
339341
340342
build_linux_python_lighting_device:
@@ -344,7 +346,7 @@ jobs:
344346
if: github.actor != 'restyled-io[bot]'
345347

346348
container:
347-
image: ghcr.io/project-chip/chip-build:54
349+
image: ghcr.io/project-chip/chip-build:77
348350
volumes:
349351
- "/:/runner-root-volume"
350352
- "/tmp/log_output:/tmp/test_logs"
@@ -414,9 +416,8 @@ jobs:
414416
# "host clang" build, which uses the pigweed
415417
# clang.
416418
"default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
417-
"python_lib") GN_ARGS='enable_rtti=true enable_pylib=true';;
418419
esac
419-
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
420+
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --export-compile-commands
420421
scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
421422
BUILD_TYPE=$BUILD_TYPE scripts/tests/gn_tests.sh
422423
done
@@ -456,7 +457,7 @@ jobs:
456457
if: github.actor != 'restyled-io[bot]'
457458

458459
container:
459-
image: ghcr.io/project-chip/chip-build:65
460+
image: ghcr.io/project-chip/chip-build:77
460461
volumes:
461462
- "/:/runner-root-volume"
462463
- "/tmp/log_output:/tmp/test_logs"

0 commit comments

Comments
 (0)