Skip to content

Commit 523e694

Browse files
authored
Merge branch 'master' into tc_cnet_4_10_automate
2 parents c760fc7 + b2a86bd commit 523e694

File tree

1,230 files changed

+99301
-17742
lines changed

Some content is hidden

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

1,230 files changed

+99301
-17742
lines changed

.devcontainer/Dockerfile

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
2222
ARG USERNAME=vscode
2323
ARG USER_UID=1000
2424
ARG USER_GID=$USER_UID
25-
ENV LANG en_US.utf8
25+
ENV LANG=en_US.utf8
2626

2727

2828
# These are installed for terminal/dev convenience. If more tooling for build is required, please
@@ -54,24 +54,24 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5454
&& chmod +x /usr/local/bin/restyle-path \
5555
&& :
5656

57-
RUN mkdir -p /opt/sdk/sdks/ \
57+
RUN mkdir -p /opt/android/sdk \
5858
&& chown -R $USERNAME:$USERNAME \
59-
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
59+
/opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
6060
$ANDROID_HOME \
6161
$IDF_TOOLS_PATH \
6262
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6363
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6464
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6565
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6666
&& chmod -R +x \
67-
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
67+
$ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
6868
&& chmod -R +w \
6969
$IDF_TOOLS_PATH \
7070
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
7171
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
7272
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
7373
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
74-
# Safe directory is preffered over chown.
74+
# Safe directory is preferred over chown.
7575
&& git config --global --add safe.directory "*" \
7676
&& :
7777

@@ -81,17 +81,17 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
8181
&& ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
8282
&& : # last line
8383

84-
ENV TIZEN_ROOTFS /tizen_rootfs
84+
ENV TIZEN_ROOTFS=/tizen_rootfs
8585

8686
# Fast Model GDB plugins path for debugging support
87-
ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
87+
ENV FAST_MODEL_PLUGINS_PATH=/opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
8888

8989
# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
9090
# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
9191
# from compilation caching and distributed compilation at the same time.
9292
#
9393
# NOTE: In order to use distributed compilation with icecc, one should run
9494
# "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
95+
ENV CHIP_PW_COMMAND_LAUNCHER=ccache
96+
ENV CCACHE_PREFIX=icecc
97+
ENV PATH=/usr/lib/ccache:$PATH

.gemini/config.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
have_fun: false
2+
code_review:
3+
# Disabled until we have clarity/guidance at a CSA level
4+
disable: true
5+
comment_severity_threshold: MEDIUM
6+
max_review_comments: -1
7+
pull_request_opened:
8+
help: false
9+
summary: false
10+
code_review: true

.github/.wordlist.txt

+14
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ amebad
4949
amebaiot
5050
AmebaZ
5151
amebaz2
52+
ANC
5253
announcementReason
5354
AnnounceOTAProvider
5455
AnnounceOTAProviderRequest
@@ -85,6 +86,7 @@ ASR
8586
AssertionError
8687
AST
8788
ASYNC
89+
ATL
8890
ATLs
8991
atomics
9092
att
@@ -114,6 +116,7 @@ avahi
114116
avL
115117
AwaitNextAction
116118
AXXXF
119+
Axxxx
117120
AYNJV
118121
babaf
119122
backend
@@ -330,6 +333,7 @@ CurrentHue
330333
CurrentLevel
331334
CurrentSaturation
332335
customAcl
336+
customizable
333337
customizations
334338
cvfJ
335339
cxx
@@ -507,6 +511,7 @@ entrypoint
507511
enum
508512
Enums
509513
env
514+
EP
510515
epochKey
511516
epochStartTime
512517
eq
@@ -538,6 +543,7 @@ ExtendedPAN
538543
ExtensionEntry
539544
extern
540545
extpanid
546+
Exx
541547
FabricId
542548
fabricIdx
543549
fabricIndex
@@ -585,6 +591,7 @@ fuzzer
585591
fuzzers
586592
fuzztest
587593
FW
594+
Fxx
588595
gbl
589596
gcloud
590597
GDB
@@ -684,6 +691,7 @@ ICMP
684691
IDF
685692
IDL
686693
IDLs
694+
IDM
687695
idt
688696
idx
689697
ifconfig
@@ -1053,6 +1061,7 @@ otatesting
10531061
otaURL
10541062
OTBR
10551063
otcli
1064+
OU
10561065
outform
10571066
outgoingCommands
10581067
overridable
@@ -1164,6 +1173,7 @@ PyObject
11641173
pypi
11651174
PyRun
11661175
pytest
1176+
PYTHONPATH
11671177
QEMU
11681178
Qorvo
11691179
QPG
@@ -1235,6 +1245,7 @@ RPi's
12351245
RPis
12361246
RSA
12371247
rsn
1248+
Rsp
12381249
RSSI
12391250
RST
12401251
rsync
@@ -1341,6 +1352,7 @@ SRP
13411352
SRV
13421353
SSBL
13431354
SSID
1355+
SSL
13441356
startoffset
13451357
StartScan
13461358
startsWith
@@ -1508,6 +1520,7 @@ unfocus
15081520
Unicast
15091521
UniFlash
15101522
UnitLocalization
1523+
unittest
15111524
unpair
15121525
unprovisioned
15131526
Unsecure
@@ -1622,6 +1635,7 @@ xFFFF
16221635
xfffff
16231636
xFFFFFFEFFFFFFFFF
16241637
XMLPICSValidator
1638+
XMLs
16251639
xtensa
16261640
xvzf
16271641
xwayland

.github/dependabot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ updates:
3838
- dependency-name: "third_party/java_deps/repo"
3939
- dependency-name: "third_party/jlink/repo"
4040
- dependency-name: "third_party/jsoncpp/repo"
41+
- dependency-name: "third_party/libdatachannel/repo"
4142
- dependency-name: "third_party/libwebsockets/repo"
4243
- dependency-name: "third_party/lwip/repo"
4344
- dependency-name: "third_party/mbed-mcu-boot/repo"

.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:112
37+
image: ghcr.io/project-chip/chip-build:119
3838

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

+11-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: github.actor != 'restyled-io[bot]'
4444

4545
container:
46-
image: ghcr.io/project-chip/chip-build:112
46+
image: ghcr.io/project-chip/chip-build:119
4747
volumes:
4848
- "/:/runner-root-volume"
4949
- "/tmp/log_output:/tmp/test_logs"
@@ -131,7 +131,7 @@ jobs:
131131
if: github.actor != 'restyled-io[bot]'
132132

133133
container:
134-
image: ghcr.io/project-chip/chip-build:112
134+
image: ghcr.io/project-chip/chip-build:119
135135
volumes:
136136
- "/:/runner-root-volume"
137137
- "/tmp/log_output:/tmp/test_logs"
@@ -211,11 +211,16 @@ jobs:
211211
- name: Find changed files
212212
id: changed-files
213213
uses: tj-actions/changed-files@v45
214+
with:
215+
# Exclude all files under "third_party/"
216+
files-ignore: |
217+
third_party/
218+
214219
- name: Clang-tidy validation
215220
# NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
216221
# See https://github.com/llvm/llvm-project/issues/97426
217222
env:
218-
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
223+
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.changed_files }}
219224
run: |
220225
touch out/changed_files.txt
221226
for file in ${ALL_CHANGED_FILES}; do
@@ -300,7 +305,7 @@ jobs:
300305
if: github.actor != 'restyled-io[bot]'
301306

302307
container:
303-
image: ghcr.io/project-chip/chip-build:112
308+
image: ghcr.io/project-chip/chip-build:119
304309
volumes:
305310
- "/:/runner-root-volume"
306311
- "/tmp/log_output:/tmp/test_logs"
@@ -365,7 +370,7 @@ jobs:
365370
if: github.actor != 'restyled-io[bot]'
366371

367372
container:
368-
image: ghcr.io/project-chip/chip-build:112
373+
image: ghcr.io/project-chip/chip-build:119
369374
volumes:
370375
- "/:/runner-root-volume"
371376
- "/tmp/log_output:/tmp/test_logs"
@@ -487,7 +492,7 @@ jobs:
487492
runs-on: ubuntu-latest
488493

489494
container:
490-
image: ghcr.io/project-chip/chip-build:112
495+
image: ghcr.io/project-chip/chip-build:119
491496
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
492497
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
493498

.github/workflows/chef.yaml

+27-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:112
39+
image: ghcr.io/project-chip/chip-build:119
4040
options: --user root
4141

4242
steps:
@@ -51,13 +51,35 @@ jobs:
5151
run: |
5252
./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t linux"
5353
54+
chef_linux_all_devices:
55+
name: Chef - Linux CI Examples (All chef devices)
56+
timeout-minutes: 60
57+
runs-on: ubuntu-latest
58+
if: github.actor != 'restyled-io[bot]'
59+
60+
container:
61+
image: ghcr.io/project-chip/chip-build:119
62+
options: --user root
63+
64+
steps:
65+
- name: Checkout
66+
uses: actions/checkout@v4
67+
- name: Checkout submodules & Bootstrap
68+
uses: ./.github/actions/checkout-submodules-and-bootstrap
69+
with:
70+
platform: linux
71+
- name: CI Examples Linux
72+
shell: bash
73+
run: |
74+
./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci_linux"
75+
5476
chef_esp32:
5577
name: Chef - ESP32 CI Examples
5678
runs-on: ubuntu-latest
5779
if: github.actor != 'restyled-io[bot]'
5880

5981
container:
60-
image: ghcr.io/project-chip/chip-build-esp32:112
82+
image: ghcr.io/project-chip/chip-build-esp32:119
6183
options: --user root
6284

6385
steps:
@@ -78,7 +100,7 @@ jobs:
78100
if: github.actor != 'restyled-io[bot]'
79101

80102
container:
81-
image: ghcr.io/project-chip/chip-build-nrf-platform:112
103+
image: ghcr.io/project-chip/chip-build-nrf-platform:119
82104
options: --user root
83105

84106
steps:
@@ -99,7 +121,7 @@ jobs:
99121
if: github.actor != 'restyled-io[bot]'
100122

101123
container:
102-
image: ghcr.io/project-chip/chip-build-telink:112
124+
image: ghcr.io/project-chip/chip-build-telink:119
103125
options: --user root
104126

105127
steps:
@@ -111,7 +133,7 @@ jobs:
111133
platform: telink
112134
# - name: Update Zephyr to specific revision (for developers purpose)
113135
# shell: bash
114-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ce4027fc0768b8509758af2e43f74e3fd2c7d58d"
136+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py fdccaba1ebc147908e9cca653e6c6743def3332b"
115137
- name: CI Examples Telink
116138
shell: bash
117139
run: |

.github/workflows/cherry-picks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: Cherry-Pick into sve branch
26-
uses: carloscastrojumo/github-cherry-pick-action@v1.0.9
26+
uses: carloscastrojumo/github-cherry-pick-action@v1.0.10
2727
with:
2828
token: ${{ secrets.MATTER_PAT }}
2929
branch: 1.3-sve

.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: Get Cirque Bootstrap cache key
7676
id: cirque-bootstrap-cache-key
7777
run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
78-
- uses: Wandalen/wretry.action@v1.4.10
78+
- uses: Wandalen/wretry.action@v3.8.0
7979
name: Cirque Bootstrap cache
8080
if: ${{ !env.ACT }}
8181
continue-on-error: true

.github/workflows/darwin.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,10 @@ jobs:
116116
117117
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
118118
119-
# Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
120119
xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
121120
-resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
122121
-sdk macosx ${{ matrix.options.arguments }} \
123-
CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
122+
GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
124123
> >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
125124
- name: Generate Summary
126125
if: always()

.github/workflows/docbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
touch _build/html/.nojekyll
4747
- name: Deploy to gh-pages
4848
if: github.repository == 'project-chip/connectedhomeip' && github.event_name == 'push' && github.ref_name == 'master'
49-
uses: peaceiris/actions-gh-pages@v3
49+
uses: peaceiris/actions-gh-pages@v4
5050
with:
5151
deploy_key: ${{ secrets.DOXYGEN_DEPLOY_KEY }}
5252
external_repository: project-chip/connectedhomeip-doc

.github/workflows/docker_img.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
- "-nxp-zephyr"
106106
- "-nrf-platform"
107107
- "-telink"
108+
- "-telink-zephyr_3_3"
108109
- "-ti"
109110
- "-tizen"
110111
- "-openiotsdk"

0 commit comments

Comments
 (0)