Skip to content

Commit 386dac7

Browse files
committed
Merge branch 'master' into matter-python
2 parents 49a8fa2 + 2ed64bc commit 386dac7

File tree

2,777 files changed

+251673
-154906
lines changed

Some content is hidden

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

2,777 files changed

+251673
-154906
lines changed

.github/.wordlist.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ decrypt
369369
decrypted
370370
DEDEDEDE
371371
deepnote
372+
deepwiki
372373
DefaultOTAProviders
373374
DefaultOTARequestor
374375
DefaultOTARequestorDriver
@@ -755,10 +756,12 @@ itsfoss
755756
IW
756757
JDK
757758
jinja
759+
JCM
758760
JLink
759761
JLinkExe
760762
JLinkRTTClient
761763
JN
764+
jf
762765
jni
763766
jpg
764767
jre

.github/actions/add-ipv6/action.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Set up an IPV6 environment
2+
description: Creates a socket pair with a "peer" network namespace that supports IPV6
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Set up IPV6
7+
if: ${{ runner.os == 'Linux' }}
8+
shell: bash
9+
run: |
10+
ip netns add peer
11+
12+
ip link add name veth0 type veth peer name veth0-peer
13+
ip -6 addr add fd00:0:1:1::1/64 dev veth0
14+
ip link set dev veth0 up
15+
16+
ip link set veth0-peer netns peer
17+
ip netns exec peer ip -6 addr add fd00:0:1:1::2/64 dev veth0-peer
18+
ip netns exec peer ip link set dev veth0-peer up

.github/actions/bootstrap-cache/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
attempt_limit: 3
1212
attempt_delay: 2000
1313
with: |
14-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'scripts/py_matter_idl/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
14+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'scripts/tests/requirements.txt', 'scripts/py_matter_idl/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
1515
path: |
1616
.environment
1717
build_overrides/pigweed_environment.gni

.github/actions/bootstrap/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
# In addition to the various setup files, the work directory matters as well,
2626
# because the bootstrapped Pigweed environment contains absolute paths.
2727
echo "Calculating bootstrap cache key for '$PWD'"
28-
FILES_HASH="${{ hashFiles('scripts/setup/*', 'scripts/py_matter_idl/*', 'third_party/pigweed/**') }}"
28+
FILES_HASH="${{ hashFiles('scripts/setup/*', 'scripts/tests/requirements.txt', 'scripts/py_matter_idl/*', 'third_party/pigweed/**') }}"
2929
case "$RUNNER_OS" in
3030
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
3131
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;

.github/actions/perform-codeql-analysis/action.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,26 @@ runs:
88
using: "composite"
99
steps:
1010
- name: Perform CodeQL Analysis
11-
uses: github/codeql-action/analyze@v2
11+
uses: github/codeql-action/analyze@v3
1212
with:
1313
category: "/language:${{ inputs.language }}"
1414
upload: False
1515
output: sarif-results
1616
- name: filter-sarif
1717
uses: advanced-security/filter-sarif@v1
1818
with:
19+
# We also disable checks that are not too important and that result in many hundreds of alerts with generated code, such as the check "Empty branch of conditional"
1920
patterns: |
2021
-**/third_party/**
2122
-**/scripts/**
23+
-**/tests/**
24+
-**/*.cpp:cpp/trivial-switch
25+
-**/*.cpp:cpp/empty-block
2226
input: "sarif-results/${{ inputs.language }}.sarif"
2327
output: "sarif-results/${{ inputs.language }}.sarif"
2428

2529
- name: Upload SARIF
26-
uses: github/codeql-action/upload-sarif@v2
30+
uses: github/codeql-action/upload-sarif@v3
2731
with:
2832
sarif_file: "sarif-results/${{ inputs.language }}.sarif"
2933
- name: Upload loc as a Build Artifact

.github/workflows/bloat_check.yaml

Lines changed: 1 addition & 1 deletion
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:125
37+
image: ghcr.io/project-chip/chip-build:129
3838

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

Lines changed: 58 additions & 30 deletions
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:125
46+
image: ghcr.io/project-chip/chip-build:129
4747
volumes:
4848
- "/:/runner-root-volume"
4949
- "/tmp/log_output:/tmp/test_logs"
@@ -75,27 +75,49 @@ jobs:
7575
uses: github/codeql-action/init@v3
7676
with:
7777
languages: "cpp"
78+
queries: security-extended, security-and-quality
7879
- name: Setup Build
7980
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
8081
- name: Run Build
8182
run: scripts/run_in_build_env.sh "ninja -C ./out"
8283
- name: Run Tests
8384
run: scripts/tests/gn_tests.sh
85+
- name: Clean out build output
86+
run: rm -rf ./out
87+
88+
# Do not run below steps with CodeQL since we are getting "Out of runner space issues" with CodeQL and their added coverage is limited
8489
- name: Set up Build Without Detail Logging
90+
if: inputs.run-codeql != true
8591
run: scripts/build/gn_gen.sh --args="chip_detail_logging=false"
8692
- name: Run Build Without Detail Logging
93+
if: inputs.run-codeql != true
8794
run: scripts/run_in_build_env.sh "ninja -C ./out"
95+
- name: Cleanout build output
96+
if: inputs.run-codeql != true
97+
run: rm -rf ./out
8898
- name: Set up Build Without Progress Logging
99+
if: inputs.run-codeql != true
89100
run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false"
90101
- name: Run Build Without Progress Logging
102+
if: inputs.run-codeql != true
91103
run: scripts/run_in_build_env.sh "ninja -C ./out"
104+
- name: Clean out build output
105+
if: inputs.run-codeql != true
106+
run: rm -rf ./out
92107
- name: Set up Build Without Error Logging
108+
if: inputs.run-codeql != true
93109
run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false chip_error_logging=false"
94110
- name: Run Build Without Error Logging
111+
if: inputs.run-codeql != true
95112
run: scripts/run_in_build_env.sh "ninja -C ./out"
113+
- name: Clean out build output
114+
if: inputs.run-codeql != true
115+
run: rm -rf ./out
96116
- name: Set up Build Without Logging
117+
if: inputs.run-codeql != true
97118
run: scripts/build/gn_gen.sh --args="chip_logging=false"
98119
- name: Run Build Without Logging
120+
if: inputs.run-codeql != true
99121
run: scripts/run_in_build_env.sh "ninja -C ./out"
100122
- name: Uploading core files
101123
uses: actions/upload-artifact@v4
@@ -128,10 +150,10 @@ jobs:
128150
name: Build on Linux (fake, gcc_release, clang, simulated)
129151

130152
runs-on: ubuntu-latest
131-
if: github.actor != 'restyled-io[bot]'
153+
if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
132154

133155
container:
134-
image: ghcr.io/project-chip/chip-build:125
156+
image: ghcr.io/project-chip/chip-build:129
135157
volumes:
136158
- "/:/runner-root-volume"
137159
- "/tmp/log_output:/tmp/test_logs"
@@ -161,11 +183,13 @@ jobs:
161183
uses: ./.github/actions/checkout-submodules-and-bootstrap
162184
with:
163185
platform: linux
164-
- name: Initialize CodeQL
165-
if: ${{ inputs.run-codeql }}
166-
uses: github/codeql-action/init@v3
167-
with:
168-
languages: "cpp"
186+
# CodeQL + this job is consistently failing (in the step "Run Tests with sanitizers")
187+
# deactivate until a better workaround is found
188+
# - name: Initialize CodeQL
189+
# if: ${{ inputs.run-codeql }}
190+
# uses: github/codeql-action/init@v3
191+
# with:
192+
# languages: "cpp"
169193
- name: Setup and Build Simulated Device
170194
run: |
171195
BUILD_TYPE=simulated
@@ -270,11 +294,13 @@ jobs:
270294
run: |
271295
./scripts/run_in_build_env.sh \
272296
"./scripts/build/build_examples.py --target linux-fake-tests build"
273-
- name: Perform CodeQL Analysis
274-
if: ${{ inputs.run-codeql }}
275-
uses: ./.github/actions/perform-codeql-analysis
276-
with:
277-
language: cpp
297+
# CodeQL + this job is consistently failing (in the step "Run Tests with sanitizers")
298+
# deactivate until a better solution is found
299+
# - name: Perform CodeQL Analysis
300+
# if: ${{ inputs.run-codeql }}
301+
# uses: ./.github/actions/perform-codeql-analysis
302+
# with:
303+
# language: cpp
278304

279305
- name: Uploading core files
280306
uses: actions/upload-artifact@v4
@@ -302,10 +328,10 @@ jobs:
302328
name: Build on Linux (python_lib)
303329

304330
runs-on: ubuntu-latest
305-
if: github.actor != 'restyled-io[bot]'
331+
if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
306332

307333
container:
308-
image: ghcr.io/project-chip/chip-build:125
334+
image: ghcr.io/project-chip/chip-build:129
309335
volumes:
310336
- "/:/runner-root-volume"
311337
- "/tmp/log_output:/tmp/test_logs"
@@ -367,10 +393,10 @@ jobs:
367393
name: Build on Linux (python lighting-app)
368394

369395
runs-on: ubuntu-latest
370-
if: github.actor != 'restyled-io[bot]'
396+
if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
371397

372398
container:
373-
image: ghcr.io/project-chip/chip-build:125
399+
image: ghcr.io/project-chip/chip-build:129
374400
volumes:
375401
- "/:/runner-root-volume"
376402
- "/tmp/log_output:/tmp/test_logs"
@@ -400,7 +426,7 @@ jobs:
400426
build_darwin:
401427
name: Build on Darwin (clang, simulated)
402428
runs-on: macos-13
403-
if: github.actor != 'restyled-io[bot]'
429+
if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
404430

405431
steps:
406432
- name: Checkout
@@ -415,11 +441,12 @@ jobs:
415441
- name: Try to ensure the directory for diagnostic log collection exists
416442
run: |
417443
mkdir -p ~/Library/Logs/DiagnosticReports || true
418-
- name: Initialize CodeQL
419-
if: ${{ inputs.run-codeql }}
420-
uses: github/codeql-action/init@v3
421-
with:
422-
languages: "cpp"
444+
# Build on Darwin + CodeQL often takes 6 hours (which is more than the maximum allowed by GitHub Runners), Deactivate it until we can investigate this
445+
# - name: Initialize CodeQL
446+
# if: ${{ inputs.run-codeql }}
447+
# uses: github/codeql-action/init@v3
448+
# with:
449+
# languages: "cpp"
423450

424451
- name: Setup and Build Simulated Device
425452
run: |
@@ -473,11 +500,12 @@ jobs:
473500
name: crash-log-darwin
474501
path: ~/Library/Logs/DiagnosticReports/
475502

476-
- name: Perform CodeQL Analysis
477-
if: ${{ inputs.run-codeql }}
478-
uses: ./.github/actions/perform-codeql-analysis
479-
with:
480-
language: cpp
503+
# Build on Darwin + CodeQL often takes 6 hours (which is more than the maximum allowed by GitHub Runners), Deactivate it until we can investigate this
504+
# - name: Perform CodeQL Analysis
505+
# if: ${{ inputs.run-codeql }}
506+
# uses: ./.github/actions/perform-codeql-analysis
507+
# with:
508+
# language: cpp
481509

482510
# TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
483511
# TODO https://github.com/project-chip/connectedhomeip/issues/1512
@@ -488,11 +516,11 @@ jobs:
488516
env:
489517
TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
490518

491-
if: github.actor != 'restyled-io[bot]'
519+
if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true
492520
runs-on: ubuntu-latest
493521

494522
container:
495-
image: ghcr.io/project-chip/chip-build:125
523+
image: ghcr.io/project-chip/chip-build:129
496524
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
497525
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
498526

.github/workflows/chef.yaml

Lines changed: 6 additions & 6 deletions
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:125
39+
image: ghcr.io/project-chip/chip-build:129
4040
options: --user root
4141

4242
steps:
@@ -58,7 +58,7 @@ jobs:
5858
if: github.actor != 'restyled-io[bot]'
5959

6060
container:
61-
image: ghcr.io/project-chip/chip-build:125
61+
image: ghcr.io/project-chip/chip-build:129
6262
options: --user root
6363

6464
steps:
@@ -79,7 +79,7 @@ jobs:
7979
if: github.actor != 'restyled-io[bot]'
8080

8181
container:
82-
image: ghcr.io/project-chip/chip-build-esp32:125
82+
image: ghcr.io/project-chip/chip-build-esp32:129
8383
options: --user root
8484

8585
steps:
@@ -100,7 +100,7 @@ jobs:
100100
if: github.actor != 'restyled-io[bot]'
101101

102102
container:
103-
image: ghcr.io/project-chip/chip-build-nrf-platform:125
103+
image: ghcr.io/project-chip/chip-build-nrf-platform:129
104104
options: --user root
105105

106106
steps:
@@ -121,7 +121,7 @@ jobs:
121121
if: github.actor != 'restyled-io[bot]'
122122

123123
container:
124-
image: ghcr.io/project-chip/chip-build-telink:125
124+
image: ghcr.io/project-chip/chip-build-telink:129
125125
options: --user root
126126

127127
steps:
@@ -133,7 +133,7 @@ jobs:
133133
platform: telink
134134
# - name: Update Zephyr to specific revision (for developers purpose)
135135
# shell: bash
136-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 46b82695b9390d74bcfa4b01a14a009c01b96895"
136+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ed037d7de7c23eb14c908453d2d481cdf782796a"
137137
- name: CI Examples Telink
138138
shell: bash
139139
run: |

.github/workflows/darwin.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,6 @@ jobs:
9696
platform: darwin
9797
bootstrap-log-name:
9898
bootstrap-logs-framework-${{ matrix.options.flavor }}
99-
- name: Build example All Clusters Server
100-
run: |
101-
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/all-clusters-app chip_config_network_layer_ble=false
102-
- name: Build example OTA Provider
103-
run: |
104-
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug/ota-provider-app chip_config_network_layer_ble=false
105-
- name: Build example OTA Requestor
106-
run: |
107-
scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug/ota-requestor-app chip_config_network_layer_ble=false non_spec_compliant_ota_action_delay_floor=0
10899
- name: Run Framework Tests
109100
# We want to ensure that our log upload runs on timeout, so use a timeout here shorter
110101
# than the 6-hour overall job timeout. 4.5 hours should be plenty.

.github/workflows/doxygen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
runs-on: ubuntu-latest
8686
container:
87-
image: ghcr.io/project-chip/chip-build-doxygen:125
87+
image: ghcr.io/project-chip/chip-build-doxygen:129
8888

8989
if: github.actor != 'restyled-io[bot]'
9090

.github/workflows/examples-ameba.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-ameba:125
42+
image: ghcr.io/project-chip/chip-build-ameba:129
4343
options: --user root
4444

4545
steps:

.github/workflows/examples-asr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-asr:125
40+
image: ghcr.io/project-chip/chip-build-asr:129
4141
options: --user root
4242

4343
steps:

.github/workflows/examples-bouffalolab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-bouffalolab:125
41+
image: ghcr.io/project-chip/chip-build-bouffalolab:129
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

0 commit comments

Comments
 (0)