Skip to content

Commit a2e9ade

Browse files
erwinpan1erwinpan1
authored
Merge branch 'project-chip:master' into fix_media_input_accessinterface
2 parents c561334 + b823a29 commit a2e9ade

File tree

2,583 files changed

+166742
-52230
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,583 files changed

+166742
-52230
lines changed

‎.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN apt-get update \
4343
&& :
4444

4545
RUN groupadd -g $USER_GID $USERNAME \
46-
&& useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
46+
&& useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
4747
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
4848
&& chmod 0440 /etc/sudoers.d/$USERNAME \
4949
&& :

‎.github/.wordlist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ DevKitM
402402
devtype
403403
df
404404
dfe
405+
DFILE
405406
dfu
406407
DgDxsfHx
407408
dhclient
@@ -649,6 +650,7 @@ href
649650
HSM
650651
hsm
651652
HTTPS
653+
Humidistat
652654
HW
653655
hwadr
654656
HydrogenConcentrationMeasurement
@@ -1354,6 +1356,7 @@ SVR
13541356
SWD
13551357
SWU
13561358
symlinks
1359+
sysbuild
13571360
sysconfdir
13581361
SysConfig
13591362
sysctl

‎.github/dependabot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ updates:
5454
- dependency-name: "third_party/open-iot-sdk/repo"
5555
- dependency-name: "third_party/ot-br-posix/repo"
5656
- dependency-name: "third_party/perfetto/repo"
57-
- dependency-name: "third_party/pybind11/repo"
5857
- dependency-name: "third_party/qpg_sdk/repo"
5958
- dependency-name: "third_party/silabs/repo"
6059
- dependency-name: "third_party/simw-top-mini/repo"

‎.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

‎.github/stale.yml

-42
This file was deleted.

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

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+4-5
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:65
45+
image: ghcr.io/project-chip/chip-build:74
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:54
141+
image: ghcr.io/project-chip/chip-build:74
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -308,7 +308,7 @@ jobs:
308308

309309
- name: Setup Build, Run Build and Run Tests
310310
run: |
311-
scripts/build/gn_gen.sh --args="enable_rtti=true enable_pylib=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
311+
scripts/build/gn_gen.sh --args="enable_rtti=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
312312
scripts/run_in_build_env.sh "ninja -C ./out"
313313
scripts/tests/gn_tests.sh
314314
- name: Setup test python environment
@@ -414,7 +414,6 @@ jobs:
414414
# "host clang" build, which uses the pigweed
415415
# clang.
416416
"default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
417-
"python_lib") GN_ARGS='enable_rtti=true enable_pylib=true';;
418417
esac
419418
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
420419
scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
@@ -456,7 +455,7 @@ jobs:
456455
if: github.actor != 'restyled-io[bot]'
457456

458457
container:
459-
image: ghcr.io/project-chip/chip-build:65
458+
image: ghcr.io/project-chip/chip-build:74
460459
volumes:
461460
- "/:/runner-root-volume"
462461
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

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

104104
steps:

‎.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
9696
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
9797
--target darwin-x64-rvc-${BUILD_VARIANT} \
98+
--target darwin-x64-network-manager-${BUILD_VARIANT} \
9899
build \
99100
--copy-artifacts-to objdir-clone \
100101
"
@@ -116,6 +117,7 @@ jobs:
116117
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
117118
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
118119
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
120+
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
119121
"
120122
- name: Run OTA Test
121123
run: |

‎.github/workflows/docker_img.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
# - "-imx"
103103
- "-java"
104104
- "-k32w"
105-
- "-mbed-os"
106105
- "-nrf-platform"
107106
- "-telink"
108107
- "-ti"

‎.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:65
84+
image: ghcr.io/project-chip/chip-build-doxygen:74
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:54
41+
image: ghcr.io/project-chip/chip-build-ameba:74
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:65
39+
image: ghcr.io/project-chip/chip-build-asr:74
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:54
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:74
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

+10-6
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@
1515
name: Build example - TI CC13XX_26XX
1616

1717
on:
18-
push:
19-
branches-ignore:
20-
- "dependabot/**"
21-
pull_request:
22-
merge_group:
18+
workflow_dispatch:
19+
# Temporarely disabled:
20+
# - TI CI runs out of disk space
21+
# - Image should be updated to an Ubuntu 24.04 or higher based one (move from :54 version)
22+
# push:
23+
# branches-ignore:
24+
# - 'dependabot/**'
25+
# pull_request:
26+
# merge_group:
2327

2428
concurrency:
2529
group:
@@ -41,7 +45,7 @@ jobs:
4145
if: github.actor != 'restyled-io[bot]'
4246

4347
container:
44-
image: ghcr.io/project-chip/chip-build-ti:54
48+
image: ghcr.io/project-chip/chip-build-ti:74
4549
volumes:
4650
- "/tmp/bloat_reports:/tmp/bloat_reports"
4751
steps:

‎.github/workflows/examples-cc32xx.yaml

+10-6
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@
1515
name: Build example - TI CC32XX
1616

1717
on:
18-
push:
19-
branches-ignore:
20-
- 'dependabot/**'
21-
pull_request:
22-
merge_group:
18+
workflow_dispatch:
19+
# Temporarely disabled:
20+
# - TI CI runs out of disk space
21+
# - Image should be updated to an Ubuntu 24.04 or higher based one (move from :54 version)
22+
# push:
23+
# branches-ignore:
24+
# - 'dependabot/**'
25+
# pull_request:
26+
# merge_group:
2327

2428
concurrency:
2529
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -39,7 +43,7 @@ jobs:
3943
if: github.actor != 'restyled-io[bot]'
4044

4145
container:
42-
image: ghcr.io/project-chip/chip-build-ti:54
46+
image: ghcr.io/project-chip/chip-build-ti:74
4347
volumes:
4448
- "/tmp/bloat_reports:/tmp/bloat_reports"
4549
steps:

‎.github/workflows/examples-efr32.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-efr32:65
43+
image: ghcr.io/project-chip/chip-build-efr32:73
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:54
39+
image: ghcr.io/project-chip/chip-build-esp32:74
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:54
129+
image: ghcr.io/project-chip/chip-build-esp32:74
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.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:65
39+
image: ghcr.io/project-chip/chip-build-crosscompile:74
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:54
39+
image: ghcr.io/project-chip/chip-build-imx:74
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:65
39+
image: ghcr.io/project-chip/chip-build:74
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

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

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

4141
steps:
4242
- name: Checkout
@@ -71,13 +71,16 @@ jobs:
7171
"python3 ./scripts/tests/run_tv_casting_test.py"
7272
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
7373

74-
- name:
75-
Test casting from Linux tv-casting-app to Linux tv-app -
76-
Commissioner Generated Passcode
77-
run: |
78-
./scripts/run_in_build_env.sh \
79-
"python3 ./scripts/tests/run_tv_casting_test.py --commissioner-generated-passcode=True"
80-
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
74+
# TODO: this test is flaky and was disabled
75+
# https://github.com/project-chip/connectedhomeip/issues/34598
76+
#
77+
# - name:
78+
# Test casting from Linux tv-casting-app to Linux tv-app -
79+
# Commissioner Generated Passcode
80+
# run: |
81+
# ./scripts/run_in_build_env.sh \
82+
# "python3 ./scripts/tests/run_tv_casting_test.py --commissioner-generated-passcode=True"
83+
# timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
8184

8285
- name: Uploading Size Reports
8386
uses: ./.github/actions/upload-size-reports

0 commit comments

Comments
 (0)