Skip to content

Commit 4c5df4c

Browse files
raul-marquez-csaraul-marquez-csa
authored
Merge branch 'master' into idm-4.2-troubleshoot
2 parents 3f26dc8 + 573511d commit 4c5df4c

File tree

1,622 files changed

+98373
-241392
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,622 files changed

+98373
-241392
lines changed

‎.github/workflows/bloat_check.yaml

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

3535
container:
36-
image: ghcr.io/project-chip/chip-build:32
36+
image: ghcr.io/project-chip/chip-build:35
3737

3838
steps:
3939
- name: Checkout

‎.github/workflows/build.yaml

+5-5
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:32
43+
image: ghcr.io/project-chip/chip-build:35
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -135,7 +135,7 @@ jobs:
135135
if: github.actor != 'restyled-io[bot]'
136136

137137
container:
138-
image: ghcr.io/project-chip/chip-build:32
138+
image: ghcr.io/project-chip/chip-build:35
139139
volumes:
140140
- "/tmp/log_output:/tmp/test_logs"
141141
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -283,7 +283,7 @@ jobs:
283283
if: github.actor != 'restyled-io[bot]'
284284

285285
container:
286-
image: ghcr.io/project-chip/chip-build:32
286+
image: ghcr.io/project-chip/chip-build:35
287287
volumes:
288288
- "/tmp/log_output:/tmp/test_logs"
289289
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -343,7 +343,7 @@ jobs:
343343
if: github.actor != 'restyled-io[bot]'
344344

345345
container:
346-
image: ghcr.io/project-chip/chip-build:32
346+
image: ghcr.io/project-chip/chip-build:35
347347
volumes:
348348
- "/tmp/log_output:/tmp/test_logs"
349349
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -451,7 +451,7 @@ jobs:
451451
if: github.actor != 'restyled-io[bot]'
452452

453453
container:
454-
image: ghcr.io/project-chip/chip-build:32
454+
image: ghcr.io/project-chip/chip-build:35
455455
volumes:
456456
- "/tmp/log_output:/tmp/test_logs"
457457
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0

‎.github/workflows/chef.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.actor != 'restyled-io[bot]'
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:32
36+
image: ghcr.io/project-chip/chip-build:35
3737
options: --user root
3838

3939
steps:
@@ -54,7 +54,7 @@ jobs:
5454
if: github.actor != 'restyled-io[bot]'
5555

5656
container:
57-
image: ghcr.io/project-chip/chip-build-esp32:32
57+
image: ghcr.io/project-chip/chip-build-esp32:35
5858
options: --user root
5959

6060
steps:
@@ -75,7 +75,7 @@ jobs:
7575
if: github.actor != 'restyled-io[bot]'
7676

7777
container:
78-
image: ghcr.io/project-chip/chip-build-nrf-platform:32
78+
image: ghcr.io/project-chip/chip-build-nrf-platform:35
7979
options: --user root
8080

8181
steps:
@@ -96,7 +96,7 @@ jobs:
9696
if: github.actor != 'restyled-io[bot]'
9797

9898
container:
99-
image: ghcr.io/project-chip/chip-build-telink:32
99+
image: ghcr.io/project-chip/chip-build-telink:35
100100
options: --user root
101101

102102
steps:
@@ -108,7 +108,7 @@ jobs:
108108
platform: telink
109109
# - name: Update Zephyr to specific revision (for developers purpose)
110110
# shell: bash
111-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
111+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
112112
- name: CI Examples Telink
113113
shell: bash
114114
run: |

‎.github/workflows/cirque.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# need to run with privilege, which isn't supported by job.XXX.contaner
4141
# https://github.com/actions/container-action/issues/2
4242
# container:
43-
# image: ghcr.io/project-chip/chip-build-cirque:32
43+
# image: ghcr.io/project-chip/chip-build-cirque:35
4444
# volumes:
4545
# - "/tmp:/tmp"
4646
# - "/dev/pts:/dev/pts"
@@ -71,7 +71,7 @@ jobs:
7171
- name: Get Cirque Bootstrap cache key
7272
id: cirque-bootstrap-cache-key
7373
run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
74-
- uses: Wandalen/wretry.action@v1.3.0
74+
- uses: Wandalen/wretry.action@v1.4.4
7575
name: Cirque Bootstrap cache
7676
if: ${{ !env.ACT }}
7777
continue-on-error: true

‎.github/workflows/darwin-tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,15 @@ jobs:
9999
--target darwin-x64-tv-app-${BUILD_VARIANT} \
100100
--target darwin-x64-bridge-${BUILD_VARIANT} \
101101
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
102+
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
102103
build \
103104
--copy-artifacts-to objdir-clone \
104105
"
105106
- name: Run Tests
106107
run: |
107108
./scripts/run_in_build_env.sh \
108109
"./scripts/tests/run_test_suite.py \
110+
--runner darwin_framework_tool_python \
109111
--chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
110112
--target-skip-glob '{TestAccessControlConstraints}' \
111113
run \
@@ -117,6 +119,7 @@ jobs:
117119
--ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
118120
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
119121
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
122+
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
120123
"
121124
- name: Run OTA Test
122125
run: |

‎.github/workflows/darwin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ jobs:
123123
run: |
124124
xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
125125
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
126+
- name: Uploading .ips files in Xcode derived data to debug the failure
127+
uses: actions/upload-artifact@v4
128+
if: ${{ failure() && !env.ACT }}
129+
with:
130+
name: darwin-framework-derived-data
131+
path: ~/Library/Developer/Xcode/DerivedData/**/*.ips
132+
retention-days: 5
126133
- name: Uploading log files
127134
uses: actions/upload-artifact@v4
128135
if: ${{ failure() && !env.ACT }}

‎.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:32
84+
image: ghcr.io/project-chip/chip-build-doxygen:35
8585

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

‎.github/workflows/examples-ameba.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-ameba:32
39+
image: ghcr.io/project-chip/chip-build-ameba:35
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-asr.yaml

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

3636
container:
37-
image: ghcr.io/project-chip/chip-build-asr:32
37+
image: ghcr.io/project-chip/chip-build-asr:35
3838
options: --user root
3939

4040
steps:

‎.github/workflows/examples-bouffalolab.yaml

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

3737
container:
38-
image: ghcr.io/project-chip/chip-build-bouffalolab:32
38+
image: ghcr.io/project-chip/chip-build-bouffalolab:35
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-cc13x2x7_26x2x7.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-ti:32
39+
image: ghcr.io/project-chip/chip-build-ti:35
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242
steps:

‎.github/workflows/examples-cc32xx.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-ti:32
40+
image: ghcr.io/project-chip/chip-build-ti:35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-efr32.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-efr32:32
41+
image: ghcr.io/project-chip/chip-build-efr32:36
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-esp32:32
37+
image: ghcr.io/project-chip/chip-build-esp32:35
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

@@ -130,7 +130,7 @@ jobs:
130130
if: github.actor != 'restyled-io[bot]'
131131

132132
container:
133-
image: ghcr.io/project-chip/chip-build-esp32:32
133+
image: ghcr.io/project-chip/chip-build-esp32:35
134134
volumes:
135135
- "/tmp/bloat_reports:/tmp/bloat_reports"
136136

‎.github/workflows/examples-infineon.yaml

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

3737
container:
38-
image: ghcr.io/project-chip/chip-build-infineon:32
38+
image: ghcr.io/project-chip/chip-build-infineon:35
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-k32w.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-k32w:32
40+
image: ghcr.io/project-chip/chip-build-k32w:33
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

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

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

3636
container:
37-
image: ghcr.io/project-chip/chip-build-crosscompile:32
37+
image: ghcr.io/project-chip/chip-build-crosscompile:35
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

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

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

3636
container:
37-
image: ghcr.io/project-chip/chip-build-imx:32
37+
image: ghcr.io/project-chip/chip-build-imx:35
3838

3939
steps:
4040
- name: Checkout

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

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

3636
container:
37-
image: ghcr.io/project-chip/chip-build:32
37+
image: ghcr.io/project-chip/chip-build:35
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

‎.github/workflows/examples-mbed.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-mbed-os:32
43+
image: ghcr.io/project-chip/chip-build-mbed-os:35
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

‎.github/workflows/examples-mw320.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:32
40+
image: ghcr.io/project-chip/chip-build:35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-nrfconnect.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-nrf-platform:32
40+
image: ghcr.io/project-chip/chip-build-nrf-platform:35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

‎.github/workflows/examples-openiotsdk.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-openiotsdk:32
41+
image: ghcr.io/project-chip/chip-build-openiotsdk:35
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
options: --privileged

‎.github/workflows/examples-qpg.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:32
40+
image: ghcr.io/project-chip/chip-build:35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-stm32.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:32
41+
image: ghcr.io/project-chip/chip-build:35
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/examples-telink.yaml

+10-13
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-telink:32
39+
image: ghcr.io/project-chip/chip-build-telink:35
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -55,7 +55,7 @@ jobs:
5555
gh-context: ${{ toJson(github) }}
5656

5757
# - name: Update Zephyr to specific revision (for developers purpose)
58-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
58+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
5959

6060
- name: Build example Telink (B92 retention) Air Quality Sensor App
6161
run: |
@@ -175,13 +175,13 @@ jobs:
175175
- name: clean out build output
176176
run: rm -rf ./out
177177

178-
- name: Build example Telink (B92) Pump App
178+
- name: Build example Telink (B95 retention) Pump App
179179
run: |
180180
./scripts/run_in_build_env.sh \
181-
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-pump' build"
181+
"./scripts/build/build_examples.py --target 'telink-tlsr9258a_retention-pump' build"
182182
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
183-
telink tlsr9528a pump-app \
184-
out/telink-tlsr9528a-pump/zephyr/zephyr.elf \
183+
telink tlsr9258a_retention pump-app \
184+
out/telink-tlsr9258a_retention-pump/zephyr/zephyr.elf \
185185
/tmp/bloat_reports/
186186
187187
- name: clean out build output
@@ -199,9 +199,6 @@ jobs:
199199
- name: clean out build output
200200
run: rm -rf ./out
201201

202-
- name: clean out build output
203-
run: rm -rf ./out
204-
205202
- name: Build example Telink (B91) Shell App
206203
run: |
207204
./scripts/run_in_build_env.sh \
@@ -250,13 +247,13 @@ jobs:
250247
- name: clean out build output
251248
run: rm -rf ./out
252249

253-
- name: Build example Telink (B91) Window Covering App
250+
- name: Build example Telink (B95) Window Covering App
254251
run: |
255252
./scripts/run_in_build_env.sh \
256-
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-window-covering' build"
253+
"./scripts/build/build_examples.py --target 'telink-tlsr9258a-window-covering' build"
257254
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
258-
telink tlsr9518adk80d window-covering \
259-
out/telink-tlsr9518adk80d-window-covering/zephyr/zephyr.elf \
255+
telink tlsr9258a window-covering \
256+
out/telink-tlsr9258a-window-covering/zephyr/zephyr.elf \
260257
/tmp/bloat_reports/
261258
262259
- name: clean out build output

0 commit comments

Comments
 (0)