Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into feature/update-tinycrypt-s…
Browse files Browse the repository at this point in the history
…upport
  • Loading branch information
rosahay-silabs committed Jan 16, 2025
2 parents 3709074 + 839a11d commit 5c33dd4
Show file tree
Hide file tree
Showing 283 changed files with 45,282 additions and 3,527 deletions.
1 change: 0 additions & 1 deletion .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,6 @@ js
json
JTAG
Jupyter
judgement
jupyterlab
KA
kAdminister
Expand Down
18 changes: 11 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
> !!!!!!!!!! Please delete the instructions below and replace with PR description
> !!!!!!!!!! Please delete the instructions below and replace with PR
> description
>
> If you have an issue number, please use a syntax of
> `Fixes #12345` and a brief change description
> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
> change description
>
> If you do not have an issue number, please have a good description of
> the problem and the fix. Help the reviewer understand what to expect.
> If you do not have an issue number, please have a good description of the
> problem and the fix. Help the reviewer understand what to expect.
>
> Add a `### Testing` section to your PR to describe how testing was done.
> See <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
> Complete/append to the `### Testing` section below, to describe how testing
> was done. See
> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
>
> Make sure you delete these instructions (to prove you have read them).
>
> !!!!!!!!!! Instructions end
#### Testing
8 changes: 4 additions & 4 deletions .github/workflows/cancel_workflows_for_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ jobs:
python-version: '3.12'
- name: Setup pip modules we use
run: |
pip install \
python3 -m venv venv
venv/bin/pip3 install \
click \
coloredlogs \
python-dateutil \
pygithub \
&& echo "DONE installint python prerequisites"
&& echo "DONE installing python prerequisites"
- name: Cancel runs
run: |
scripts/tools/cancel_workflows_for_pr.py \
venv/bin/python3 scripts/tools/cancel_workflows_for_pr.py \
--gh-api-token "${{ secrets.GITHUB_TOKEN }}" \
--require "Restyled" \
--require "Lint Code Base" \
--require "ZAP" \
--require "Run misspell" \
--require "PR validity" \
--max-pr-age-minutes 20
7 changes: 4 additions & 3 deletions .github/workflows/docbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ jobs:
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.12
cache-dependency-path: matter/docs/requirements.txt
cache: pip
- name: Install base dependencies
working-directory: matter
run: |
sudo pip3 install -U pip
pip3 install -r docs/requirements.txt
python3 -m venv venv
venv/bin/pip3 install -r docs/requirements.txt
- name: Build documentation
working-directory: matter/docs
run: |
source ../venv/bin/activate
mkdir -p _build/src
make html
touch _build/html/.nojekyll
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,26 @@ jobs:
- name: Clean out build output
run: rm -rf ./out

- name: Build example BL702L Contact Sensor
timeout-minutes: 30
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd \
build \
--copy-artifacts-to out/artifacts \
"
- name: Prepare some bloat report from the previous builds
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702l bl702l+mfd+littlefs contact-sensor-app \
out/artifacts/bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd/chip-bl702l-contact-sensor-example.out \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out

- name: Uploading Size Reports
uses: ./.github/actions/upload-size-reports
if: ${{ !env.ACT }}
with:
platform-name: BouffaloLab
platform-name: BouffaloLab
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:94
image: ghcr.io/project-chip/chip-build-efr32:95
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ jobs:
check_testing_header:
runs-on: ubuntu-latest
steps:

- name: Check for `### Testing` section in PR
id: check-testing
continue-on-error: true
run: |
python -c 'import sys; pr_summary = """${{ github.event.pull_request.body }}"""; sys.exit(0 if "### Testing" in pr_summary else 1)'
cat >/tmp/pr-summary.txt << "EndMarkerForPrSummary"
${{ github.event.pull_request.body }}
EndMarkerForPrSummary
python -c 'import sys; pr_summary = open("/tmp/pr-summary.txt", "rt").read(); sys.exit(0 if "### Testing" in pr_summary else 1)'
- name: Check for PR starting instructions
id: check-instructions
continue-on-error: true
run: |
python -c 'import sys; pr_summary = """${{ github.event.pull_request.body }}"""; sys.exit(1 if "Make sure you delete these instructions" in pr_summary else 0)'
cat >/tmp/pr-summary.txt << "EndMarkerForPrSummary"
${{ github.event.pull_request.body }}
EndMarkerForPrSummary
python -c 'import sys; pr_summary = open("/tmp/pr-summary.txt", "rt").read(); sys.exit(1 if "Make sure you delete these instructions" in pr_summary else 0)'
# NOTE: comments disabled for now as separate permissions are required
# failing CI step may be sufficient to start (although it contains less information about why it failed)
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/protocol_compatibility.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install click coloredlogs lark
python3 -m venv venv
venv/bin/pip3 install click coloredlogs lark
- name: Create old/new copies
run: |
mkdir -p out
Expand All @@ -45,5 +45,4 @@ jobs:
patch -p1 <out/patch.diff
- name: Check backwards compatibility
run: |
scripts/backwards_compatibility_checker.py out/old_version.matter out/new_version.matter
venv/bin/python3 scripts/backwards_compatibility_checker.py out/old_version.matter out/new_version.matter
2 changes: 2 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml \
src/app/zap-templates/zcl/data-model/chip/global-enums.xml \
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
src/app/zap-templates/zcl/data-model/chip/push-av-stream-transport-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \
src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml \
Expand Down Expand Up @@ -197,6 +198,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/tls-certificate-management-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@ to open the pull request for details or open additional issue in GitHub)
Ensure that there is sufficient detail in issue summaries to make the content of
the PR clear:

- a `TLDR` of the change content. This is a judgement call on details,
- a `TLDR` of the change content. This is a judgment call on details,
generally you should include a what was changed and why. The change is
trivial/short, this can be very short (i.e. "fixed typos" is perfectly
acceptable, however if changing 100-1000s of line, the areas of changes
should be explained)
- If a crash/error is fixed, explain the root cause and if the fix is not
obvious (again, judgement call), explain why the given approach was taken.
obvious (again, judgment call), explain why the given approach was taken.
- Help the reviewer out with any notable information (specific platform
issues, extra thoughts or requests for feedback or gotchas on tricky code,
followup work or PR dependencies)
Expand All @@ -230,7 +230,7 @@ out of convenience.
updated to cover functionality" or "existing tests already cover this" (make
sure they do. Integration tests often only cover happy paths).

Add any notes on not covered things. It is a judgement call on how much can
Add any notes on not covered things. It is a judgment call on how much can
be covered as 100% sounds great however not always possible.

- Manual testing
Expand Down
4 changes: 4 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,10 @@ if (CONFIG_OPENTHREAD_BORDER_ROUTER)
list(APPEND matter_requires espressif__esp_rcp_update)
endif()

if (CONFIG_SEC_CERT_DAC_PROVIDER)
list(APPEND matter_requires espressif__esp_secure_cert_mgr)
endif()

add_prebuilt_library(matterlib "${CMAKE_CURRENT_BINARY_DIR}/lib/libCHIP.a"
REQUIRES ${matter_requires})

Expand Down
2 changes: 2 additions & 0 deletions docs/ids_and_codes/zap_clusters.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,11 @@ Generally regenerate using one of:
| 1362 | 0x552 | CameraAvSettingsUserLevelManagement |
| 1363 | 0x553 | WebRTCTransportProvider |
| 1364 | 0x554 | WebRTCTransportRequestor |
| 1365 | 0x555 | PushAvStreamTransport |
| 1366 | 0x556 | Chime |
| 1872 | 0x750 | EcosystemInformation |
| 1873 | 0x751 | CommissionerControl |
| 2049 | 0x801 | TlsCertificateManagement |
| 4294048773 | 0xFFF1FC05 | UnitTesting |
| 4294048774 | 0xFFF1FC06 | FaultInjection |
| 4294048800 | 0xFFF1FC20 | SampleMei |
1 change: 1 addition & 0 deletions docs/issue_triage.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ types or functionality) as well as individual examples.
| `examples/rvc-app` | | UNMAINTAINED |
| `examples/smoke-co-alarm-app` | | UNMAINTAINED |
| `examples/temperature-measurement-app` | | UNMAINTAINED |
| `examples/terms-and-conditions-app` | James Swan | |
| `examples/thermostat` | | UNMAINTAINED |
| `examples/thread-br-app` | | UNMAINTAINED |
| `examples/tv-app` | Chris DeCenzo, Lazar Kovacic | |
Expand Down
Loading

0 comments on commit 5c33dd4

Please sign in to comment.