Skip to content

Commit

Permalink
Merge branch 'master' into iot_sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
wy-hh authored Aug 8, 2024
2 parents 4f12bed + 298b454 commit 1be95e9
Show file tree
Hide file tree
Showing 281 changed files with 11,540 additions and 1,668 deletions.
42 changes: 0 additions & 42 deletions .github/stale.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/docker_img.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ jobs:
# - "-imx"
- "-java"
- "-k32w"
- "-mbed-os"
- "-nrf-platform"
- "-telink"
- "-ti"
Expand Down
170 changes: 0 additions & 170 deletions .github/workflows/examples-mbed.yaml

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "Process Stale Issues and PRs"
on:
workflow_dispatch:
schedule:
- cron: "30 1 * * *"

permissions:
issues: write
pull-requests: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
stale-issue-message:
"This issue has been automatically marked as stale because
it has not had recent activity. It will be closed if no
further activity occurs. Remove stale label or comment or
this will be closed in 30 days."
stale-pr-message:
"This pull request has been automatically marked as stale
because it has not had recent activity. It will be closed
if no further activity occurs. Remove stale label or
comment or this will be closed in 10 days."
close-issue-message:
"This stale issue has been automatically closed. Thank you
for your contributions."
close-pr-message:
"This stale pull request has been automatically closed.
Thank you for your contributions."
days-before-issue-stale: 30
days-before-issue-close: -1 # Don't close them for now
days-before-pr-stale: 90
days-before-pr-close: 10
exempt-issue-labels:
"security,blocked,cert blocker,build issue,Spec XML
align,CI/CD improvements,memory"
exempt-pr-labels:
"security,blocked,cert blocker,build issue,Spec XML
align,CI/CD improvements,memory"
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ jobs:
run: |
mkdir -p out/trace_data
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/controller/python/test/test_scripts/mobile-device-test.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/execute_python_tests.py --env-file /tmp/test_env.yaml --search-directory src/python_testing'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
Expand Down
33 changes: 21 additions & 12 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
pull_request_rules:
- name: Label conflicting pull requests
description: Add a label to a pull request with conflict to spot it easily
conditions:
- conflict
- '-closed'
actions:
label:
toggle:
- conflict
- name: Automatic merge on PullApprove
conditions:
- or:
- "check-success=pullapprove"
- label="fast track"
- "#approved-reviews-by>=1"
- "#review-threads-unresolved=0"
- "-draft"
- "label!=docker" # Don't auto merge docker images
- "#check-failure=0" # Don't auto merge with a failure
- "#check-pending=0" # Don't auto merge with anything pending
- "check-success~=Build" # Don't auto merge unless a build has succeeded, needed because above is true on a fresh PR before builds
- check-success=pullapprove
- label="fast track"
- '#approved-reviews-by>=1'
- '#review-threads-unresolved=0'
- '-draft'
- label!=docker
- '#check-failure=0'
- '#check-pending=0'
- check-success~=Build
- or:
- "check-success=pullapprove"
- "check-skipped=pullapprove"
- "check-neutral=pullapprove"
- check-success=pullapprove
- check-skipped=pullapprove
- check-neutral=pullapprove
actions:
merge:
method: squash
5 changes: 1 addition & 4 deletions config/beken/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ import("//build_overrides/chip.gni")
#import("${chip_root}/build/chip/tests.gni")

group("beken") {
deps = [
"${chip_root}/examples/lighting-app/beken:MatterApp",
"${chip_root}/src/lib",
]
deps = [ "${chip_root}/src/lib" ]
}
group("default") {
deps = [ ":beken" ]
Expand Down
7 changes: 7 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,13 @@ if(NOT CONFIG_USE_MINIMAL_MDNS)
endif()
endif()

if(CONFIG_OPENTHREAD_BORDER_ROUTER)
idf_component_get_property(rcp_update_lib espressif__esp_rcp_update COMPONENT_LIB)
list(APPEND chip_libraries $<TARGET_FILE:${rcp_update_lib}>)
idf_component_get_property(serial_flasher_lib espressif__esp-serial-flasher COMPONENT_LIB)
list(APPEND chip_libraries $<TARGET_FILE:${serial_flasher_lib}>)
endif()

if (CONFIG_ENABLE_ENCRYPTED_OTA)
idf_component_get_property(esp_encrypted_img_lib espressif__esp_encrypted_img COMPONENT_LIB)
list(APPEND chip_libraries $<TARGET_FILE:${esp_encrypted_img_lib}>)
Expand Down
5 changes: 5 additions & 0 deletions config/esp32/components/chip/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ dependencies:
rules:
- if: "idf_version >=5.0"
- if: "target != esp32h2"

espressif/esp_rcp_update:
version: "1.0.3"
rules:
- if: "idf_version >=5.0"
Loading

0 comments on commit 1be95e9

Please sign in to comment.