Skip to content

Commit 3cee79c

Browse files
raul-marquez-csaraul-marquez-csa
authored
Merge branch 'master' into idm-4.2-troubleshoot
2 parents e1110ec + 005f1b4 commit 3cee79c

File tree

2,499 files changed

+127950
-65003
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,499 files changed

+127950
-65003
lines changed

‎.clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Checks: >
1212
readability-redundant-string-init,
1313
-bugprone-assignment-in-if-condition,
1414
-bugprone-branch-clone,
15+
-bugprone-casting-through-void, #TODO remove this after fixing issues in source code, issue 34008
1516
-bugprone-copy-constructor-init,
1617
-bugprone-easily-swappable-parameters,
1718
-bugprone-forward-declaration-namespace,

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

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+7-7
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:50
45+
image: ghcr.io/project-chip/chip-build:54
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:50
141+
image: ghcr.io/project-chip/chip-build:54
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -281,7 +281,7 @@ jobs:
281281
if: github.actor != 'restyled-io[bot]'
282282

283283
container:
284-
image: ghcr.io/project-chip/chip-build:50
284+
image: ghcr.io/project-chip/chip-build:54
285285
volumes:
286286
- "/:/runner-root-volume"
287287
- "/tmp/log_output:/tmp/test_logs"
@@ -332,8 +332,8 @@ jobs:
332332
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
333333
scripts/run_in_build_env.sh 'virtualenv pyenv'
334334
source pyenv/bin/activate
335-
pip3 install -r src/setup_payload/python/requirements.txt
336-
python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool
335+
pip3 install -r scripts/setup/requirements.setuppayload.txt
336+
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
337337
338338
build_linux_python_lighting_device:
339339
name: Build on Linux (python lighting-app)
@@ -342,7 +342,7 @@ jobs:
342342
if: github.actor != 'restyled-io[bot]'
343343

344344
container:
345-
image: ghcr.io/project-chip/chip-build:50
345+
image: ghcr.io/project-chip/chip-build:54
346346
volumes:
347347
- "/:/runner-root-volume"
348348
- "/tmp/log_output:/tmp/test_logs"
@@ -451,7 +451,7 @@ jobs:
451451
if: github.actor != 'restyled-io[bot]'
452452

453453
container:
454-
image: ghcr.io/project-chip/chip-build:50
454+
image: ghcr.io/project-chip/chip-build:54
455455
volumes:
456456
- "/:/runner-root-volume"
457457
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+5-5
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:50
38+
image: ghcr.io/project-chip/chip-build:54
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:50
59+
image: ghcr.io/project-chip/chip-build-esp32:54
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:50
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:54
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:50
101+
image: ghcr.io/project-chip/chip-build-telink:57
102102
options: --user root
103103

104104
steps:
@@ -110,7 +110,7 @@ jobs:
110110
platform: telink
111111
# - name: Update Zephyr to specific revision (for developers purpose)
112112
# shell: bash
113-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 68deadeb5c20b82d68700e720d4580e8003bf1d8"
113+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
114114
- name: CI Examples Telink
115115
shell: bash
116116
run: |

‎.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# need to run with privilege, which isn't supported by job.XXX.contaner
4343
# https://github.com/actions/container-action/issues/2
4444
# container:
45-
# image: ghcr.io/project-chip/chip-build-cirque:50
45+
# image: ghcr.io/project-chip/chip-build-cirque:54
4646
# volumes:
4747
# - "/tmp:/tmp"
4848
# - "/dev/pts:/dev/pts"

‎.github/workflows/darwin.yaml

+4-9
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ jobs:
9797
bootstrap-logs-framework-${{ matrix.options.flavor }}
9898
- name: Build example All Clusters Server
9999
run: |
100-
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
100+
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/all-clusters-app chip_config_network_layer_ble=false
101101
- name: Build example OTA Provider
102102
run: |
103-
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
103+
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug/ota-provider-app chip_config_network_layer_ble=false
104104
- name: Build example OTA Requestor
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
@@ -113,13 +113,8 @@ jobs:
113113
run: |
114114
mkdir -p /tmp/darwin/framework-tests
115115
echo "This is a simple log" > /tmp/darwin/framework-tests/end_user_support_log.txt
116-
../../../out/debug/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
117-
../../../out/debug/chip-all-clusters-app --interface-id -1 --dac_provider ../../../credentials/development/commissioner_dut/struct_cd_origin_pid_vid_correct/test_case_vector.json --product-id 32768 --discriminator 3839 --secured-device-port 5539 --KVS /tmp/chip-all-clusters-app-kvs2 > >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid-err.log >&2) &
118-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 101 --passcode 1001 --KVS /tmp/chip-all-clusters-app-kvs101 --secured-device-port 5531 &
119-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 102 --passcode 1002 --KVS /tmp/chip-all-clusters-app-kvs102 --secured-device-port 5532 &
120-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 103 --passcode 1003 --KVS /tmp/chip-all-clusters-app-kvs103 --secured-device-port 5533 &
121-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 104 --passcode 1004 --KVS /tmp/chip-all-clusters-app-kvs104 --secured-device-port 5534 &
122-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 105 --passcode 1005 --KVS /tmp/chip-all-clusters-app-kvs105 --secured-device-port 5535 &
116+
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
117+
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --dac_provider ../../../credentials/development/commissioner_dut/struct_cd_origin_pid_vid_correct/test_case_vector.json --product-id 32768 --discriminator 3839 --secured-device-port 5539 --KVS /tmp/chip-all-clusters-app-kvs2 > >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid-err.log >&2) &
123118
124119
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
125120

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

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

‎.github/workflows/examples-ameba.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-ameba:50
41+
image: ghcr.io/project-chip/chip-build-ameba:54
4242
options: --user root
4343

4444
steps:

‎.github/workflows/examples-asr.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-asr:50
39+
image: ghcr.io/project-chip/chip-build-asr:54
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:50
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:54
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@ name: Build example - TI CC13XX_26XX
1717
on:
1818
push:
1919
branches-ignore:
20-
- 'dependabot/**'
20+
- "dependabot/**"
2121
pull_request:
2222
merge_group:
2323

2424
concurrency:
25-
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
25+
group:
26+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
27+
'pull_request' && github.event.number) || (github.event_name ==
28+
'workflow_dispatch' && github.run_number) || github.sha }}
2629
cancel-in-progress: true
2730
env:
2831
CHIP_NO_LOG_TIMESTAMPS: true
29-
32+
3033
jobs:
3134
cc13xx_26xx:
3235
name: cc13xx_26xx
@@ -38,7 +41,7 @@ jobs:
3841
if: github.actor != 'restyled-io[bot]'
3942

4043
container:
41-
image: ghcr.io/project-chip/chip-build-ti:50
44+
image: ghcr.io/project-chip/chip-build-ti:54
4245
volumes:
4346
- "/tmp/bloat_reports:/tmp/bloat_reports"
4447
steps:
@@ -47,13 +50,14 @@ jobs:
4750
- name: Checkout submodules & Bootstrap
4851
uses: ./.github/actions/checkout-submodules-and-bootstrap
4952
with:
50-
platform: cc13xx_26xx
53+
platform: cc13xx_26xx
54+
extra-submodule-parameters: " --recursive"
5155
- name: Set up environment for size reports
5256
uses: ./.github/actions/setup-size-reports
5357
if: ${{ !env.ACT }}
5458
with:
55-
gh-context: ${{ toJson(github) }}
56-
59+
gh-context: ${{ toJson(github) }}
60+
5761
- name: Build examples
5862
run: |
5963
scripts/run_in_build_env.sh "\
@@ -103,4 +107,4 @@ jobs:
103107
uses: ./.github/actions/upload-size-reports
104108
if: ${{ !env.ACT }}
105109
with:
106-
platform-name: cc13x4_26x4
110+
platform-name: cc13x4_26x4

‎.github/workflows/examples-cc32xx.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-ti:50
42+
image: ghcr.io/project-chip/chip-build-ti:54
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-efr32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
name: EFR32
3434

3535
env:
36-
SILABS_BOARD: BRD4161A
36+
SILABS_BOARD: BRD4187C
3737
BUILD_TYPE: gn_efr32
3838

3939
runs-on: ubuntu-latest
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:50
43+
image: ghcr.io/project-chip/chip-build-efr32:56
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
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-esp32:50
39+
image: ghcr.io/project-chip/chip-build-esp32:54
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

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

‎.github/workflows/examples-infineon.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-infineon:50
40+
image: ghcr.io/project-chip/chip-build-infineon:54
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
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

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

‎.github/workflows/examples-linux-imx.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-imx:50
39+
image: ghcr.io/project-chip/chip-build-imx:54
4040

4141
steps:
4242
- name: Checkout

‎.github/workflows/examples-linux-standalone.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:50
39+
image: ghcr.io/project-chip/chip-build:54
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

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

+2-2
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:41
39+
image: ghcr.io/project-chip/chip-build:54
4040

4141
steps:
4242
- name: Checkout
@@ -61,7 +61,7 @@ jobs:
6161
- name: Build Linux tv-casting-app
6262
run: |
6363
./scripts/run_in_build_env.sh \
64-
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
64+
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app chip_casting_simplified=true"
6565
6666
- name: Test casting from Linux tv-casting-app to Linux tv-app
6767
run: |

‎.github/workflows/examples-mbed.yaml

+3-2
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-mbed-os:50
45+
image: ghcr.io/project-chip/chip-build-mbed-os:54
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848

@@ -158,7 +158,8 @@ jobs:
158158
rm -rf ./out
159159
160160
- name: Build unit tests
161-
# Temporarily disable build due to running out of flash space
161+
# Temporarily disabled build due to running out of flash space
162+
# TODO Issue #33978: re-enable unit testing after split of unit tests is done
162163
if: false
163164
run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
164165

‎.github/workflows/examples-mw320.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:50
42+
image: ghcr.io/project-chip/chip-build:54
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-nrfconnect.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-nrf-platform:50
42+
image: ghcr.io/project-chip/chip-build-nrf-platform:54
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545

‎.github/workflows/examples-nuttx.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-nuttx:51
38+
image: ghcr.io/project-chip/chip-build-nuttx:54
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

0 commit comments

Comments
 (0)