Skip to content

Commit 7f90401

Browse files
authored
Merge branch 'master' into create_CADMIN_1_5_test
2 parents 8e2b850 + df5ee33 commit 7f90401

File tree

1,922 files changed

+173266
-51052
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,922 files changed

+173266
-51052
lines changed

.devcontainer/devcontainer.json

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
{
22
"name": "CHIP Ubuntu Development Environment",
33
"runArgs": [
4-
"--cap-add=SYS_PTRACE",
5-
"--security-opt",
6-
"seccomp=unconfined",
74
"--network=host",
8-
"--privileged",
9-
"-v",
10-
"/dev/bus/usb:/dev/bus/usb:ro",
115
"--device-cgroup-rule=a 189:* rmw",
126
"--add-host=host.docker.internal:host-gateway"
137
],
8+
"privileged": true,
9+
"capAdd": ["SYS_PTRACE"],
10+
"securityOpt": ["seccomp=unconfined"],
1411
"mounts": [
15-
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
12+
{
13+
"source": "/var/run/docker.sock",
14+
"target": "/var/run/docker.sock",
15+
"type": "bind"
16+
},
17+
{
18+
"source": "/dev/bus/usb",
19+
"target": "/dev/bus/usb",
20+
"type": "bind"
21+
}
1622
],
17-
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
23+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
1824
"image": "matter-dev-environment:local",
1925
"remoteUser": "vscode",
2026
"containerEnv": {

.github/PULL_REQUEST_TEMPLATE.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
> !!!!!!!!!! Please delete the instructions below and replace with PR description
1+
2+
#### Testing
3+
4+
> !!!!!!!!!! Please delete the instructions below and replace with PR
5+
> description above.
26
>
3-
> If you have an issue number, please use a syntax of
4-
> `Fixes #12345` and a brief change description
7+
> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
8+
> change description
59
>
6-
> If you do not have an issue number, please have a good description of
7-
> the problem and the fix. Help the reviewer understand what to expect.
10+
> If you do not have an issue number, please have a good description of the
11+
> problem and the fix. Help the reviewer understand what to expect.
12+
>
13+
> Complete/append to the `### Testing` section above, to describe how testing
14+
> was done. See
15+
> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
816
>
917
> Make sure you delete these instructions (to prove you have read them).
1018
>
1119
> !!!!!!!!!! Instructions end
12-

.github/labeler.yml

-9
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,6 @@ 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-
131122
############################################################
132123
# Source Code
133124
############################################################

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

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

+15-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:94
46+
image: ghcr.io/project-chip/chip-build:104
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:94
134+
image: ghcr.io/project-chip/chip-build:104
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:94
303+
image: ghcr.io/project-chip/chip-build:104
312304
volumes:
313305
- "/:/runner-root-volume"
314306
- "/tmp/log_output:/tmp/test_logs"
@@ -363,6 +355,8 @@ jobs:
363355
python -m ensurepip --upgrade
364356
python -m pip install -r scripts/setup/requirements.setuppayload.txt
365357
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
358+
- name: Run revocation set generation tests
359+
run: scripts/run_in_build_env.sh 'python3 -m unittest -v credentials/generate_revocation_set.py'
366360

367361
build_linux_python_lighting_device:
368362
name: Build on Linux (python lighting-app)
@@ -371,7 +365,7 @@ jobs:
371365
if: github.actor != 'restyled-io[bot]'
372366

373367
container:
374-
image: ghcr.io/project-chip/chip-build:94
368+
image: ghcr.io/project-chip/chip-build:104
375369
volumes:
376370
- "/:/runner-root-volume"
377371
- "/tmp/log_output:/tmp/test_logs"
@@ -486,16 +480,16 @@ jobs:
486480
build_linux_gcc_coverage:
487481
name: Build on Linux (coverage)
488482

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

492489
container:
493-
image: ghcr.io/project-chip/chip-build:94
494-
volumes:
495-
- "/:/runner-root-volume"
496-
- "/tmp/log_output:/tmp/test_logs"
490+
image: ghcr.io/project-chip/chip-build:104
497491
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
498-
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"
499493

500494
steps:
501495
- name: Checkout
@@ -504,6 +498,8 @@ jobs:
504498
uses: ./.github/actions/checkout-submodules-and-bootstrap
505499
with:
506500
platform: linux
501+
bootstrap-log-name: bootstrap-logs-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
507502

508503
- name: Run Build Coverage
509-
run: ./scripts/build_coverage.sh
504+
run: ./scripts/build_coverage.sh --yaml
505+

.github/workflows/cancel_workflows_for_pr.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ jobs:
3535
python-version: '3.12'
3636
- name: Setup pip modules we use
3737
run: |
38-
pip install \
38+
python3 -m venv venv
39+
venv/bin/pip3 install \
3940
click \
4041
coloredlogs \
4142
python-dateutil \
4243
pygithub \
43-
&& echo "DONE installint python prerequisites"
44+
&& echo "DONE installing python prerequisites"
4445
- name: Cancel runs
4546
run: |
46-
scripts/tools/cancel_workflows_for_pr.py \
47+
venv/bin/python3 scripts/tools/cancel_workflows_for_pr.py \
4748
--gh-api-token "${{ secrets.GITHUB_TOKEN }}" \
4849
--require "Restyled" \
4950
--require "Lint Code Base" \

.github/workflows/check-data-model-directory-updates.yaml

+42-10
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,52 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: Check for changes to data_model directory without a sha update
15+
name: Data model directory checks
1616

1717
on:
1818
pull_request:
19-
paths:
20-
- "data_model/**"
2119

2220
jobs:
23-
check-submodule-update-label:
24-
name: Check for changes to data_model directory without a sha update
21+
check-data_model-updates:
22+
name: Check for updates to data model directory without SHA updates
2523
runs-on: ubuntu-latest
26-
if: "git diff --name-only HEAD^..HEAD data_model/ | grep -q spec_sha"
24+
container:
25+
image: ghcr.io/project-chip/chip-build
2726
steps:
28-
- name: Error Message
29-
run: echo This pull request attempts to update data_model directory, but is missing updates to spec_sha file with the latest version of the sha. Files in the data_model directory are generated automatically and should not be updated manually.
30-
- name: Fail Job
31-
run: exit 1
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 2
31+
- name: Check for changes to master data_model directory without a SHA update
32+
run: |
33+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/master
34+
- name: Check for changes to 1.3 data_model directory without a SHA update
35+
run: |
36+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.3
37+
- name: Check for changes to 1.4 data_model directory without a SHA update
38+
run: |
39+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.4
40+
- name: Check for changes to 1.4.1 data_model directory without a SHA update
41+
run: |
42+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.4.1
43+
44+
check-data_model-build-file:
45+
name: Check that all data_model files are listed in the data_model_xmls.gni build file
46+
runs-on: ubuntu-latest
47+
container:
48+
image: ghcr.io/project-chip/chip-build
49+
steps:
50+
- name: Checkout
51+
uses: actions/checkout@v4
52+
- name: Setup pip modules we use
53+
run: |
54+
python3 -m venv out/venv
55+
out/venv/bin/pip3 install \
56+
jinja2
57+
- name: Generate build file (data_model_xmls.gni)
58+
run: out/venv/bin/python3 src/python_testing/matter_testing_infrastructure/generate_data_model_xmls_gni.py
59+
- name: Ensure git works in current working directory
60+
run: git config --global --add safe.directory `pwd`
61+
- name: Check for uncommited changes
62+
run: |
63+
git diff --exit-code HEAD -- src/python_testing/matter_testing_infrastructure/data_model_xmls.gni

.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:94
39+
image: ghcr.io/project-chip/chip-build:104
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:94
60+
image: ghcr.io/project-chip/chip-build-esp32:104
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:94
81+
image: ghcr.io/project-chip/chip-build-nrf-platform:104
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:94
102+
image: ghcr.io/project-chip/chip-build-telink:104
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 ffdbfe7560c0b628e03ab487ab110eeed9bdc8c7"
114+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
115115
- name: CI Examples Telink
116116
shell: bash
117117
run: |

.github/workflows/darwin.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,18 @@ jobs:
117117
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
118118
119119
# Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
120-
xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx ${{ matrix.options.arguments }} \
120+
xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
121+
-resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
122+
-sdk macosx ${{ matrix.options.arguments }} \
121123
CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
122124
> >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
125+
- name: Generate Summary
126+
if: always()
127+
working-directory: /tmp
128+
run: |
129+
wget https://github.com/a7ex/xcresultparser/releases/download/1.8.4/xcresultparser.zip
130+
unzip -j xcresultparser.zip
131+
./xcresultparser --output-format md --failed-tests-only /tmp/darwin/framework-tests/TestResults.xcresult >>"$GITHUB_STEP_SUMMARY"
123132
- name: Collect crash logs
124133
if: failure() && !env.ACT
125134
run: |

.github/workflows/docbuild.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,18 @@ jobs:
2929
- name: Install Python
3030
uses: actions/setup-python@v5
3131
with:
32-
python-version: 3.8
32+
python-version: 3.12
3333
cache-dependency-path: matter/docs/requirements.txt
3434
cache: pip
3535
- name: Install base dependencies
3636
working-directory: matter
3737
run: |
38-
sudo pip3 install -U pip
39-
pip3 install -r docs/requirements.txt
38+
python3 -m venv venv
39+
venv/bin/pip3 install -r docs/requirements.txt
4040
- name: Build documentation
4141
working-directory: matter/docs
4242
run: |
43+
source ../venv/bin/activate
4344
mkdir -p _build/src
4445
make html
4546
touch _build/html/.nojekyll

.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:94
87+
image: ghcr.io/project-chip/chip-build-doxygen:104
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:94
42+
image: ghcr.io/project-chip/chip-build-ameba:104
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:94
40+
image: ghcr.io/project-chip/chip-build-asr:104
4141
options: --user root
4242

4343
steps:

0 commit comments

Comments
 (0)