Skip to content

Commit ede7ee9

Browse files
Sarthak-ShahaSarthak-Shaha
committed
Merge branch 'master' into brd4350a_support_
2 parents 187365d + e86768b commit ede7ee9

File tree

735 files changed

+45618
-10958
lines changed

Some content is hidden

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

735 files changed

+45618
-10958
lines changed

‎.github/workflows/build.yaml

+8-14
Original file line numberDiff line numberDiff line change
@@ -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
@@ -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:
495490
image: ghcr.io/project-chip/chip-build:104
496-
volumes:
497-
- "/:/runner-root-volume"
498-
- "/tmp/log_output:/tmp/test_logs"
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,8 @@ 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
505+

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

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
- name: Check for changes to 1.4 data_model directory without a SHA update
3838
run: |
3939
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
4043
4144
check-data_model-build-file:
4245
name: Check that all data_model files are listed in the data_model_xmls.gni build file

‎.github/workflows/examples-nrfconnect.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,12 @@ jobs:
193193
nrfconnect nrf7002dk_nrf5340_cpuapp all-clusters-app \
194194
examples/all-clusters-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
195195
/tmp/bloat_reports/
196-
# Disable native build until next release
197-
# - name: Run unit tests for Zephyr native_posix_64 platform
198-
# if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true'
199-
# run: |
200-
# scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
196+
- name: Run unit tests for Zephyr native_posix_64 platform
197+
if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true'
198+
run: |
199+
# Temporarily fix link issue
200+
sed -i '151s/<LINK_FLAGS> //' /opt/NordicSemiconductor/nrfconnect/zephyr/cmake/linker/ld/target.cmake
201+
scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
201202
- name: Uploading Failed Test Logs
202203
uses: actions/upload-artifact@v4
203204
if: ${{ failure() && !env.ACT }}

‎.github/workflows/full-android.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-android:106
42+
image: ghcr.io/project-chip/chip-build-android:108
4343
volumes:
4444
- "/tmp/log_output:/tmp/test_logs"
4545

‎.github/workflows/lint.yml

-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
--known-failure app/util/config.h \
115115
--known-failure app/util/DataModelHandler.cpp \
116116
--known-failure app/util/DataModelHandler.h \
117-
--known-failure app/util/ember-global-attribute-access-interface.h \
118117
--known-failure app/util/ember-io-storage.h \
119118
--known-failure app/util/endpoint-config-api.h \
120119
--known-failure app/util/generic-callbacks.h \
@@ -133,7 +132,6 @@ jobs:
133132
# for them. Keeping them as a list as they still need review ...
134133
# --known-failure app/util/attribute-table.cpp \
135134
# --known-failure app/util/ember-io-storage.cpp \
136-
# --known-failure app/util/ember-global-attribute-access-interface.cpp \
137135
# --known-failure app/util/attribute-storage.cpp \
138136
- name: Check for matter lint errors
139137
if: always()

‎.github/workflows/smoketest-android.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-android:106
40+
image: ghcr.io/project-chip/chip-build-android:108
4141
volumes:
4242
- "/:/runner-root-volume"
4343
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ jobs:
502502
--target linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang \
503503
--target linux-x64-fabric-sync-ipv6only-no-ble-no-wifi-clang \
504504
--target linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang \
505+
--target linux-x64-terms-and-conditions \
505506
--target linux-x64-python-bindings \
506507
build \
507508
--copy-artifacts-to objdir-clone \
@@ -520,6 +521,7 @@ jobs:
520521
echo "FABRIC_BRIDGE_APP: out/linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang/fabric-bridge-app" >> /tmp/test_env.yaml
521522
echo "FABRIC_SYNC_APP: out/linux-x64-fabric-sync-ipv6only-no-ble-no-wifi-clang/fabric-sync" >> /tmp/test_env.yaml
522523
echo "LIGHTING_APP_NO_UNIQUE_ID: out/linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang/chip-lighting-app" >> /tmp/test_env.yaml
524+
echo "TERMS_AND_CONDITIONS_APP: out/linux-x64-terms-and-conditions/chip-terms-and-conditions-app" >> /tmp/test_env.yaml
523525
echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
524526
echo "TRACE_TEST_JSON: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
525527
echo "TRACE_TEST_PERFETTO: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
@@ -537,6 +539,7 @@ jobs:
537539
scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/TestIdChecks.py'
538540
scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/TestMatterTestingSupport.py'
539541
scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/TestSpecParsingDeviceType.py'
542+
scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/TestSpecParsingSelection.py'
540543
scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/TestSpecParsingSupport.py'
541544
542545
- name: Run Tests

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
platforms = mw320
208208
[submodule "third_party/silabs/matter_support"]
209209
path = third_party/silabs/matter_support
210-
url = https://github.com/SiliconLabs/sdk_support.git
210+
url = https://github.com/SiliconLabsSoftware/matter_support.git
211211
branch = main
212212
platforms = silabs,silabs_docker
213213
[submodule "third_party/silabs/simplicity_sdk"]

0 commit comments

Comments
 (0)