Skip to content

Commit

Permalink
Merge branch 'master' into timesync_commissioning
Browse files Browse the repository at this point in the history
  • Loading branch information
cecille authored Jul 13, 2023
2 parents 2a84d7c + badc0c8 commit 50da6b8
Show file tree
Hide file tree
Showing 580 changed files with 49,251 additions and 10,284 deletions.
51 changes: 0 additions & 51 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,4 @@ max-line-length = 132
exclude = third_party
.*
out/*
scripts/idl/*
./examples/common/QRCode/*
# temporarily scan only directories with fixed files
# TODO: Remove the paths below when all bugs are fixed
src/tools/chip-cert/*
build/chip/java/tests/*
build/chip/linux/*
build/config/linux/*
credentials/fetch-paa-certs-from-dcl.py
docs/_extensions/external_content.py
examples/common/pigweed/rpc_console/py/chip_rpc/console.py
examples/lighting-app/python/lighting.py
scripts/build/build/target.py
scripts/build/build/targets.py
scripts/build/builders/android.py
scripts/build/builders/bouffalolab.py
scripts/build/builders/cc13x2x7_26x2x7.py
scripts/build/builders/genio.py
scripts/build/builders/gn.py
scripts/build/builders/imx.py
scripts/build/builders/infineon.py
scripts/codegen.py
scripts/codepregen.py
scripts/error_table.py
scripts/examples/gn_to_cmakelists.py
scripts/flashing/bouffalolab_firmware_utils.py
scripts/flashing/cyw30739_firmware_utils.py
scripts/gen_chip_version.py
scripts/helpers/bloat_check.py
scripts/pregenerate/using_codegen.py
scripts/pregenerate/using_zap.py
scripts/run-clang-tidy-on-compile-commands.py
scripts/tools/check_zcl_file_sync.py
scripts/tools/convert_ini.py
scripts/tools/memory/memdf/__init__.py
scripts/tools/memory/report_summary.py
scripts/tools/silabs/FactoryDataProvider.py
scripts/tools/zap/generate.py
scripts/tools/zap/prune_outputs.py
scripts/tools/zap/version_update.py
scripts/tools/zap/zap_download.py
scripts/tools/zap_convert_all.py
src/app/ota_image_tool.py
src/app/zap_cluster_list.py
src/controller/python/chip/yaml/__init__.py
src/controller/python/chip/yaml/format_converter.py
src/controller/python/chip/yaml/runner.py
src/controller/python/py_matter_yamltest_repl_adapter/matter_yamltest_repl_adapter/runner.py
src/lib/asn1/gen_asn1oid.py
src/pybindings/pycontroller/build-chip-wheel.py
src/pybindings/pycontroller/pychip/__init__.py
src/setup_payload/python/generate_setup_payload.py
48 changes: 38 additions & 10 deletions .github/ISSUE_TEMPLATE/091-cert-blocker.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,46 @@
name: "\U0001F4DC Cert Blocker"
description: Create a report to identify matter certification blockers
title: "[CERT-BLOCKER] "
name: "\U0001F4DC Test Case Failure / Cert Blocker"
description: Create a report to identify matter certification test failures
title: "[CERT-TEST-FAILURE] "
labels: [bug, "cert blocker", "needs triage"]
body:
- type: markdown
attributes:
value: |
Thanks for reporting an issue against the Matter SDK! We need information about the cert blocker to follow up, so please help us out by filling out this information.
- type: dropdown
attributes:
label: Feature Area
description: What feature area is the test failing in?
multiple: true
options:
- Area:AirPurifiers
- Area:AirQualitySensor
- Area:ConcentrationMeasurement
- Area:DeviceAppearance
- Area:Dishwashers
- Area:DoorLockEnhancements
- Area:EventList
- Area:ICDPhase2
- Area:ModeSelect
- Area:OperationalState
- Area:Refrigerators
- Area:RobotVacuums
- Area:RoomAirConditioner
- Area:Scenes
- Area:SmokeCO2
- Area:TemperatureControlledCabinet
- Area:TimeSync
- Other
validations:
required: true
- type: input
id: testcase
attributes:
label: Test Case
description: "Which test case is failing?"
placeholder: "TC-XXXX"
validations:
required: true
- type: textarea
id: repro
attributes:
Expand Down Expand Up @@ -60,12 +94,6 @@ body:
- core
validations:
required: true
- type: input
id: platform-versions
attributes:
label: Platform Version(s)
description: "What platform version(s) are affected [optional]"
placeholder: "eg: 1.2.1, N/A"
- type: textarea
attributes:
label: Anything else?
Expand All @@ -77,4 +105,4 @@ body:
required: false
- type: markdown
attributes:
value: "Thanks for submitting a cert blocker!"
value: "Thanks for submitting a test case/cert blocker!"
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/097-ci-test-failure.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: "\U0001F6E0 Test Issue"
description: Test issue
title: "[Test Failed] "
labels: ["build issue", "needs triage", "tests"]
body:
- type: markdown
attributes:
value: |
Thanks for reporting an issue against the Matter SDK's tests! We need information about the bug report to follow up, so please help us out by filling out this information.
- type: textarea
id: repro
attributes:
label: Test issue(s)
description: "What are the tests that failed? Please include links to failed jobs if possible."
value: |
1.
2.
3.
...
validations:
required: true
- type: dropdown
attributes:
label: Platform
description: What platforms are affected?
multiple: true
options:
- ameba
- android
- cc13x2_cc26x2
- darwin
- efr32
- esp32
- freeRTOS
- IMX8
- k32w
- nrf connect
- nrf
- python
- raspi
- vscode
- windows
- other
- core (please add to version below)
- all
validations:
required: false
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: markdown
attributes:
value: "Thanks for helping improve our tests"
4 changes: 0 additions & 4 deletions .github/actions/perform-codeql-analysis/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ runs:
using: "composite"
steps:
- name: Perform CodeQL Analysis
if: ${{ inputs.run-codeql }}
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ inputs.language }}"
upload: False
output: sarif-results
- name: filter-sarif
if: ${{ inputs.run-codeql }}
uses: advanced-security/filter-sarif@v1
with:
patterns: |
Expand All @@ -25,12 +23,10 @@ runs:
output: "sarif-results/${{ inputs.language }}.sarif"

- name: Upload SARIF
if: ${{ inputs.run-codeql }}
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: "sarif-results/${{ inputs.language }}.sarif"
- name: Upload loc as a Build Artifact
if: ${{ inputs.run-codeql }}
uses: actions/upload-artifact@v2.2.0
with:
name: sarif-results
Expand Down
43 changes: 43 additions & 0 deletions .github/issue-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
darwin:
- "(ios|homepod|darwin|mac|macos)"

linux:
- "(linux)"

# Special Keywords for Cert Blockers
air purifiers:
- "(Area:AirPurifiers)"
air quality sensors:
- "(Area:AirQualitySensor)"
concentration measurement:
- "(Area:ConcentrationMeasurement)"
device appearance:
- "(Area:DeviceAppearance)"
dishwashers:
- "(Area:Dishwashers)"
door lock enhancements:
- "(Area:DoorLockEnhancements)"
event list:
- "(Area;EventList)"
icd:
- "(Area:ICDPhase2)"
icd phase 2:
- "(Area:ICDPhase2)"
mode select:
- "(Area:ModeSelect)"
operational state:
- "(Area:OperationalState)"
refrigerators:
- "(Area:Refrigerators)"
robot vacuums:
- "(Area:RobotVacuums)"
room air conditioners:
- "(Area:RoomAirConditioner)"
scenes:
- "(Area:Scenes)"
smoke & c02:
- "(Area:SmokeCO2)"
temperature controlled cabinet:
- "(Area:TemperatureControlledCabinet)"
time sync:
- "(Area:TimeSync)"
2 changes: 1 addition & 1 deletion .github/workflows/cherry-picks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
)
steps:
- name: Checkout
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Cherry-Pick into sve branch
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ jobs:
# Disable -Wunguarded-availability-new because we internally use
# APIs we added after our deployment target version. Maybe we
# should change the deployment target version instead?
#
# Disable BLE because the app does not have the permission to use
# it and that may crash the CI.
run: xcodebuild -target "Matter" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_BLE=NO
run: xcodebuild -target "Matter" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new'
working-directory: src/darwin/Framework
- name: Clean Build
run: xcodebuild clean
Expand Down Expand Up @@ -116,12 +113,16 @@ jobs:
run: |
mkdir -p /tmp/darwin/framework-tests
../../../out/debug/chip-all-clusters-app --interface-id -1 > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
../../../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) &
# Make sure each ota-requestor is using a different port, discriminator, and KVS from
# all-clusters-app and from other requestors.
#
# And a different port from the test harness too; the test harness uses port 5541.
../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5542 --discriminator 1111 --KVS /tmp/chip-ota-requestor-kvs1 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image1 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-1.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-1.log >&2) &
../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5543 --discriminator 1112 --KVS /tmp/chip-ota-requestor-kvs2 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image2 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-2.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-2.log >&2) &
# Disable BLE because the app does not have the permission to use
# it and that may crash the CI.
#
# -enableUndefinedBehaviorSanitizer instruments the code in Matter.framework,
# but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_UBSAN=YES
TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO > >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout the code
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3
with:
path: matter
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- name: "Print Actor"
run: echo ${{github.actor}}
- name: Checkout
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3
- name: Generate
run: scripts/helpers/doxygen.sh
- name: Extract branch name
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ jobs:
linux debug all-clusters-app \
out/linux-x64-all-clusters/chip-all-clusters-app \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build example Standalone All Clusters Minimal Server
run: |
./scripts/run_in_build_env.sh \
Expand Down Expand Up @@ -134,6 +136,8 @@ jobs:
linux debug+rpc+ui lighting-app \
out/linux-x64-light-rpc-with-ui/chip-lighting-app \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build example Standalone Bridge
run: |
./scripts/run_in_build_env.sh \
Expand Down Expand Up @@ -164,6 +168,8 @@ jobs:
linux debug ota-requestor-app \
out/linux-x64-ota-requestor/chip-ota-requestor-app \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build example Standalone Lock App
run: |
./scripts/run_in_build_env.sh \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
nrfconnect:
name: nRF Connect SDK
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
/tmp/bloat_reports/
- name: Build example nRF Connect SDK All Clusters App on nRF52840 DK
run: |
scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk_nrf52840 -DCONF_FILE=prj_dfu.conf
scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk_nrf52840
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
nrfconnect nrf52840dk_nrf52840 all-clusters-app \
examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
Expand Down
Loading

0 comments on commit 50da6b8

Please sign in to comment.