Skip to content

Commit adcfbdd

Browse files
wy-hhwy-hh
authored
Merge branch 'master' into cert-fix
2 parents 6b2511e + e5a49c8 commit adcfbdd

File tree

681 files changed

+30294
-20712
lines changed

Some content is hidden

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

681 files changed

+30294
-20712
lines changed

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

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+12-19
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:104
46+
image: ghcr.io/project-chip/chip-build:112
4747
volumes:
4848
- "/:/runner-root-volume"
4949
- "/tmp/log_output:/tmp/test_logs"
@@ -81,14 +81,6 @@ jobs:
8181
run: scripts/run_in_build_env.sh "ninja -C ./out"
8282
- name: Run Tests
8383
run: scripts/tests/gn_tests.sh
84-
# TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
85-
# TODO https://github.com/project-chip/connectedhomeip/issues/1512
86-
# - name: Run Code Coverage
87-
# if: ${{ contains('main', env.BUILD_TYPE) }}
88-
# run: scripts/tools/codecoverage.sh
89-
# - name: Upload Code Coverage
90-
# if: ${{ contains('main', env.BUILD_TYPE) }}
91-
# run: bash <(curl -s https://codecov.io/bash)
9284
- name: Set up Build Without Detail Logging
9385
run: scripts/build/gn_gen.sh --args="chip_detail_logging=false"
9486
- name: Run Build Without Detail Logging
@@ -139,7 +131,7 @@ jobs:
139131
if: github.actor != 'restyled-io[bot]'
140132

141133
container:
142-
image: ghcr.io/project-chip/chip-build:104
134+
image: ghcr.io/project-chip/chip-build:112
143135
volumes:
144136
- "/:/runner-root-volume"
145137
- "/tmp/log_output:/tmp/test_logs"
@@ -308,7 +300,7 @@ jobs:
308300
if: github.actor != 'restyled-io[bot]'
309301

310302
container:
311-
image: ghcr.io/project-chip/chip-build:104
303+
image: ghcr.io/project-chip/chip-build:112
312304
volumes:
313305
- "/:/runner-root-volume"
314306
- "/tmp/log_output:/tmp/test_logs"
@@ -373,7 +365,7 @@ jobs:
373365
if: github.actor != 'restyled-io[bot]'
374366

375367
container:
376-
image: ghcr.io/project-chip/chip-build:104
368+
image: ghcr.io/project-chip/chip-build:112
377369
volumes:
378370
- "/:/runner-root-volume"
379371
- "/tmp/log_output:/tmp/test_logs"
@@ -488,16 +480,16 @@ jobs:
488480
build_linux_gcc_coverage:
489481
name: Build on Linux (coverage)
490482

491-
runs-on: ubuntu-latest
483+
env:
484+
TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
485+
492486
if: github.actor != 'restyled-io[bot]'
487+
runs-on: ubuntu-latest
493488

494489
container:
495-
image: ghcr.io/project-chip/chip-build:104
496-
volumes:
497-
- "/:/runner-root-volume"
498-
- "/tmp/log_output:/tmp/test_logs"
490+
image: ghcr.io/project-chip/chip-build:112
499491
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
500-
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
492+
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
501493

502494
steps:
503495
- name: Checkout
@@ -506,6 +498,7 @@ jobs:
506498
uses: ./.github/actions/checkout-submodules-and-bootstrap
507499
with:
508500
platform: linux
501+
bootstrap-log-name: bootstrap-logs-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
509502

510503
- name: Run Build Coverage
511-
run: ./scripts/build_coverage.sh
504+
run: ./scripts/build_coverage.sh --yaml

‎.github/workflows/chef.yaml

+5-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:104
39+
image: ghcr.io/project-chip/chip-build:112
4040
options: --user root
4141

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

5959
container:
60-
image: ghcr.io/project-chip/chip-build-esp32:104
60+
image: ghcr.io/project-chip/chip-build-esp32:112
6161
options: --user root
6262

6363
steps:
@@ -78,7 +78,7 @@ jobs:
7878
if: github.actor != 'restyled-io[bot]'
7979

8080
container:
81-
image: ghcr.io/project-chip/chip-build-nrf-platform:104
81+
image: ghcr.io/project-chip/chip-build-nrf-platform:112
8282
options: --user root
8383

8484
steps:
@@ -99,7 +99,7 @@ jobs:
9999
if: github.actor != 'restyled-io[bot]'
100100

101101
container:
102-
image: ghcr.io/project-chip/chip-build-telink:104
102+
image: ghcr.io/project-chip/chip-build-telink:112
103103
options: --user root
104104

105105
steps:
@@ -111,7 +111,7 @@ jobs:
111111
platform: telink
112112
# - name: Update Zephyr to specific revision (for developers purpose)
113113
# shell: bash
114-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
114+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ce4027fc0768b8509758af2e43f74e3fd2c7d58d"
115115
- name: CI Examples Telink
116116
shell: bash
117117
run: |

‎.github/workflows/doxygen.yaml

+1-1
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:104
87+
image: ghcr.io/project-chip/chip-build-doxygen:112
8888

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

‎.github/workflows/examples-ameba.yaml

+1-1
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:104
42+
image: ghcr.io/project-chip/chip-build-ameba:112
4343
options: --user root
4444

4545
steps:

‎.github/workflows/examples-asr.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-asr:104
40+
image: ghcr.io/project-chip/chip-build-asr:112
4141
options: --user root
4242

4343
steps:

‎.github/workflows/examples-bouffalolab.yaml

+1-1
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:104
41+
image: ghcr.io/project-chip/chip-build-bouffalolab:112
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

+1-1
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-ti:104
45+
image: ghcr.io/project-chip/chip-build-ti:112
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848
steps:

‎.github/workflows/examples-cc32xx.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-ti:104
44+
image: ghcr.io/project-chip/chip-build-ti:112
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

‎.github/workflows/examples-efr32.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:104
44+
image: ghcr.io/project-chip/chip-build-efr32:112
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
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-esp32:104
40+
image: ghcr.io/project-chip/chip-build-esp32:112
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

@@ -132,7 +132,7 @@ jobs:
132132
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'
133133

134134
container:
135-
image: ghcr.io/project-chip/chip-build-esp32:104
135+
image: ghcr.io/project-chip/chip-build-esp32:112
136136
volumes:
137137
- "/tmp/bloat_reports:/tmp/bloat_reports"
138138

‎.github/workflows/examples-infineon.yaml

+1-1
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-infineon:104
41+
image: ghcr.io/project-chip/chip-build-infineon:112
4242
env:
4343
# TODO: this should probably be part of the dockerfile itself
4444
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

‎.github/workflows/examples-linux-arm.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-crosscompile:104
40+
image: ghcr.io/project-chip/chip-build-crosscompile:112
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

‎.github/workflows/examples-linux-imx.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-imx:104
40+
image: ghcr.io/project-chip/chip-build-imx:112
4141

4242
steps:
4343
- name: Checkout

‎.github/workflows/examples-linux-standalone.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:104
40+
image: ghcr.io/project-chip/chip-build:112
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

‎.github/workflows/examples-linux-tv-casting-app.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:104
40+
image: ghcr.io/project-chip/chip-build:112
4141

4242
steps:
4343
- name: Checkout

‎.github/workflows/examples-mw320.yaml

+1-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:104
43+
image: ghcr.io/project-chip/chip-build:112
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-nrfconnect.yaml

+1-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-nrf-platform:104
43+
image: ghcr.io/project-chip/chip-build-nrf-platform:112
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

‎.github/workflows/examples-nuttx.yaml

+1-1
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-nuttx:104
41+
image: ghcr.io/project-chip/chip-build-nuttx:112
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/examples-nxp.yaml

+2-2
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-nxp:104
43+
image: ghcr.io/project-chip/chip-build-nxp:112
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:
@@ -239,7 +239,7 @@ jobs:
239239
if: github.actor != 'restyled-io[bot]'
240240

241241
container:
242-
image: ghcr.io/project-chip/chip-build-nxp-zephyr:104
242+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:112
243243

244244
steps:
245245
- name: Checkout

‎.github/workflows/examples-openiotsdk.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-openiotsdk:104
39+
image: ghcr.io/project-chip/chip-build-openiotsdk:112
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242
options: --privileged

‎.github/workflows/examples-qpg.yaml

+1-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:104
43+
image: ghcr.io/project-chip/chip-build:112
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-stm32.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build:104
44+
image: ghcr.io/project-chip/chip-build:112
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

‎.github/workflows/examples-telink.yaml

+7-10
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-telink:104
42+
image: ghcr.io/project-chip/chip-build-telink:112
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545

@@ -58,7 +58,7 @@ jobs:
5858
gh-context: ${{ toJson(github) }}
5959

6060
# - name: Update Zephyr to specific revision (for developers purpose)
61-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
61+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ce4027fc0768b8509758af2e43f74e3fd2c7d58d"
6262

6363
- name: Build example Telink (B92 retention) Air Quality Sensor App
6464
# Run test for master and s07641069 PRs
@@ -77,7 +77,6 @@ jobs:
7777
- name: Build example Telink (W91) All Clusters App
7878
# Run test for master and s07641069 PRs
7979
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
80-
continue-on-error: true
8180
run: |
8281
./scripts/run_in_build_env.sh \
8382
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-all-clusters' build"
@@ -142,7 +141,6 @@ jobs:
142141

143142
- name: Build example Telink (W91) Lighting App with OTA, Factory Data
144143
# Run test for master and all PRs
145-
continue-on-error: true
146144
run: |
147145
./scripts/run_in_build_env.sh \
148146
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-light-ota-factory-data' build"
@@ -154,7 +152,7 @@ jobs:
154152
- name: clean out build output (keep tools)
155153
run: rm -rf ./out/telink*
156154

157-
- name: Build example Telink (B91) Lighting App with OTA, RPC, Factory Data and 4Mb flash
155+
- name: Build example Telink (B91) Lighting App with OTA, RPC, Factory Data, 4Mb flash
158156
# Run test for master and all PRs
159157
run: |
160158
./scripts/run_in_build_env.sh \
@@ -331,16 +329,15 @@ jobs:
331329
- name: clean out build output
332330
run: rm -rf ./out
333331

334-
- name: Build example Telink (W91) Window Covering App
332+
- name: Build example Telink (tl721x) Window Covering App
335333
# Run test for master and s07641069 PRs
336334
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
337-
continue-on-error: true
338335
run: |
339336
./scripts/run_in_build_env.sh \
340-
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-window-covering' build"
337+
"./scripts/build/build_examples.py --target 'telink-tl7218x-window-covering' build"
341338
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
342-
telink tlsr9118bdk40d window-covering \
343-
out/telink-tlsr9118bdk40d-window-covering/zephyr/zephyr.elf \
339+
telink tl7218x window-covering \
340+
out/telink-tl7218x-window-covering/zephyr/zephyr.elf \
344341
/tmp/bloat_reports/
345342
346343
- name: clean out build output

0 commit comments

Comments
 (0)