Skip to content

Commit 242d16e

Browse files
hastyhasty
authored
Merge branch 'project-chip:master' into granbery/thermostat_deadband_fix
2 parents 426eadd + afb1a33 commit 242d16e

File tree

730 files changed

+146456
-212195
lines changed

Some content is hidden

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

730 files changed

+146456
-212195
lines changed

‎.github/.wordlist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ dpkg
453453
dropdown
454454
dryrun
455455
DS
456+
DSLS
456457
duplicative
457458
DUT
458459
DUTS
@@ -572,6 +573,7 @@ fsync
572573
ftd
573574
fullclean
574575
fuzzer
576+
fuzzers
575577
fuzztest
576578
FW
577579
gbl
@@ -1625,3 +1627,4 @@ zhengyaohan
16251627
Zigbee
16261628
zigbeealliance
16271629
zigbeethread
1630+
zsdk

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

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+11-9
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:74
45+
image: ghcr.io/project-chip/chip-build:77
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -138,7 +138,7 @@ jobs:
138138
if: github.actor != 'restyled-io[bot]'
139139

140140
container:
141-
image: ghcr.io/project-chip/chip-build:74
141+
image: ghcr.io/project-chip/chip-build:77
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -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"
@@ -316,9 +316,10 @@ jobs:
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"
@@ -455,7 +457,7 @@ jobs:
455457
if: github.actor != 'restyled-io[bot]'
456458

457459
container:
458-
image: ghcr.io/project-chip/chip-build:74
460+
image: ghcr.io/project-chip/chip-build:77
459461
volumes:
460462
- "/:/runner-root-volume"
461463
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
chef_linux:
3333
name: Chef - Linux CI Examples
3434
runs-on: ubuntu-latest
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:74
38+
image: ghcr.io/project-chip/chip-build:77
3939
options: --user root
4040

4141
steps:
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:74
59+
image: ghcr.io/project-chip/chip-build-esp32:77
6060
options: --user root
6161

6262
steps:
@@ -77,7 +77,7 @@ jobs:
7777
if: github.actor != 'restyled-io[bot]'
7878

7979
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:74
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:77
8181
options: --user root
8282

8383
steps:
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:74
101+
image: ghcr.io/project-chip/chip-build-telink:77
102102
options: --user root
103103

104104
steps:

‎.github/workflows/darwin.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,9 @@ jobs:
105105
run: |
106106
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
107107
- name: Run Framework Tests
108-
# For now disable unguarded-availability-new warnings because we
109-
# internally use APIs that we are annotating as only available on
110-
# new enough versions. Maybe we should change out deployment
111-
# target versions instead?
108+
# We want to ensure that our log upload runs on timeout, so use a timeout here shorter
109+
# than the 6-hour overall job timeout. 4.5 hours should be plenty.
110+
timeout-minutes: 270
112111
working-directory: src/darwin/Framework
113112
run: |
114113
mkdir -p /tmp/darwin/framework-tests

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:74
84+
image: ghcr.io/project-chip/chip-build-doxygen:77
8585

8686
if: github.actor != 'restyled-io[bot]'
8787

‎.github/workflows/examples-ameba.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
ameba:
3333
name: Ameba
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-ameba:74
41+
image: ghcr.io/project-chip/chip-build-ameba:77
4242
options: --user root
4343

4444
steps:

‎.github/workflows/examples-asr.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
asr:
3333
name: ASR
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-asr:74
39+
image: ghcr.io/project-chip/chip-build-asr:77
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-bouffalolab.yaml

+1-1
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-bouffalolab:74
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:77
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
if: github.actor != 'restyled-io[bot]'
4646

4747
container:
48-
image: ghcr.io/project-chip/chip-build-ti:74
48+
image: ghcr.io/project-chip/chip-build-ti:77
4949
volumes:
5050
- "/tmp/bloat_reports:/tmp/bloat_reports"
5151
steps:

‎.github/workflows/examples-cc32xx.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ concurrency:
3131

3232
env:
3333
CHIP_NO_LOG_TIMESTAMPS: true
34-
34+
3535
jobs:
3636
cc32xx:
3737
name: cc32xx
@@ -43,7 +43,7 @@ jobs:
4343
if: github.actor != 'restyled-io[bot]'
4444

4545
container:
46-
image: ghcr.io/project-chip/chip-build-ti:74
46+
image: ghcr.io/project-chip/chip-build-ti:77
4747
volumes:
4848
- "/tmp/bloat_reports:/tmp/bloat_reports"
4949
steps:

‎.github/workflows/examples-efr32.yaml

+19-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:74
43+
image: ghcr.io/project-chip/chip-build-efr32:77
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:
@@ -128,6 +128,24 @@ jobs:
128128
/tmp/bloat_reports/
129129
- name: Clean out build output
130130
run: rm -rf ./out
131+
- name: Build BRD2605A WiFi Soc variants
132+
run: |
133+
./scripts/run_in_build_env.sh \
134+
"./scripts/build/build_examples.py \
135+
--enable-flashbundle \
136+
--target efr32-brd2605a-light-skip-rps-generation \
137+
--target efr32-brd2605a-lock-skip-rps-generation \
138+
build \
139+
--copy-artifacts-to out/artifacts \
140+
"
141+
- name: Prepare bloat report for brd2605a lock app
142+
run: |
143+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
144+
efr32 BRD2605a lock-app \
145+
out/efr32-brd2605a-lock-skip-rps-generation/matter-silabs-lock-example.out \
146+
/tmp/bloat_reports/
147+
- name: Clean out build output
148+
run: rm -rf ./out
131149
- name: Build EFR32 with WiFi NCP
132150
run: |
133151
./scripts/run_in_build_env.sh \

‎.github/workflows/examples-esp32.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
esp32:
3333
name: ESP32
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-esp32:74
39+
image: ghcr.io/project-chip/chip-build-esp32:77
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -91,7 +91,7 @@ jobs:
9191
run: |
9292
rm -rf ./zzz_pregenerated
9393
mv scripts/codegen.py.renamed scripts/codegen.py
94-
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
94+
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
9595
- name: Build example All Clusters App(Target:ESP32C3)
9696
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
9797
- name: Copy aside build products
@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:74
129+
image: ghcr.io/project-chip/chip-build-esp32:77
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-infineon.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828

2929
env:
3030
CHIP_NO_LOG_TIMESTAMPS: true
31-
31+
3232
jobs:
3333
infineon:
3434
name: Infineon examples building
@@ -37,7 +37,10 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-infineon:54
40+
image: ghcr.io/project-chip/chip-build-infineon:77
41+
env:
42+
# TODO: this should probably be part of the dockerfile itself
43+
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2
4144
volumes:
4245
- "/tmp/bloat_reports:/tmp/bloat_reports"
4346
steps:

‎.github/workflows/examples-linux-arm.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
arm_crosscompile:
3333
name: Linux ARM Cross compile
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-crosscompile:74
39+
image: ghcr.io/project-chip/chip-build-crosscompile:77
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-linux-imx.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
imx:
3333
name: Linux i.MX Build
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-imx:74
39+
image: ghcr.io/project-chip/chip-build-imx:77
4040

4141
steps:
4242
- name: Checkout

‎.github/workflows/examples-linux-standalone.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
linux_standalone:
3333
name: Linux Standalone
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:74
39+
image: ghcr.io/project-chip/chip-build:77
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-linux-tv-casting-app.yaml

+1-1
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:74
39+
image: ghcr.io/project-chip/chip-build:77
4040

4141
steps:
4242
- name: Checkout

0 commit comments

Comments
 (0)