Skip to content

Commit 81597b6

Browse files
committedFeb 10, 2025
Merge branch 'master' into add_coverage_to_local_py
2 parents ec5af59 + df5ee33 commit 81597b6

File tree

293 files changed

+2131
-799
lines changed

Some content is hidden

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

293 files changed

+2131
-799
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/tests.yaml

+2
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

0 commit comments

Comments
 (0)