Skip to content

Commit 66ed0b2

Browse files
vatsalghelani-csavatsalghelani-csa
committed
Merge branch 'master' into testingSupportStructureFix
2 parents 2e99385 + fd1421c commit 66ed0b2

File tree

372 files changed

+14007
-2949
lines changed

Some content is hidden

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

372 files changed

+14007
-2949
lines changed

‎.github/stale.yml

-42
This file was deleted.

‎.github/workflows/docker_img.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
# - "-imx"
103103
- "-java"
104104
- "-k32w"
105-
- "-mbed-os"
106105
- "-nrf-platform"
107106
- "-telink"
108107
- "-ti"

‎.github/workflows/examples-ameba.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-ameba:54
41+
image: ghcr.io/project-chip/chip-build-ameba:68
4242
options: --user root
4343

4444
steps:

‎.github/workflows/examples-bouffalolab.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-bouffalolab:54
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:68
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-mbed.yaml

-170
This file was deleted.

‎.github/workflows/stale.yaml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "Process Stale Issues and PRs"
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "30 1 * * *"
6+
7+
permissions:
8+
issues: write
9+
pull-requests: write
10+
11+
jobs:
12+
stale:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/stale@v9
16+
with:
17+
stale-issue-message:
18+
"This issue has been automatically marked as stale because
19+
it has not had recent activity. It will be closed if no
20+
further activity occurs. Remove stale label or comment or
21+
this will be closed in 30 days."
22+
stale-pr-message:
23+
"This pull request has been automatically marked as stale
24+
because it has not had recent activity. It will be closed
25+
if no further activity occurs. Remove stale label or
26+
comment or this will be closed in 10 days."
27+
close-issue-message:
28+
"This stale issue has been automatically closed. Thank you
29+
for your contributions."
30+
close-pr-message:
31+
"This stale pull request has been automatically closed.
32+
Thank you for your contributions."
33+
days-before-issue-stale: 30
34+
days-before-issue-close: -1 # Don't close them for now
35+
days-before-pr-stale: 90
36+
days-before-pr-close: 10
37+
exempt-issue-labels:
38+
"security,blocked,cert blocker,build issue,Spec XML
39+
align,CI/CD improvements,memory"
40+
exempt-pr-labels:
41+
"security,blocked,cert blocker,build issue,Spec XML
42+
align,CI/CD improvements,memory"

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ jobs:
506506
run: |
507507
mkdir -p out/trace_data
508508
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'
509+
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'
509510
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"'
510511
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"'
511512
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'

‎.mergify.yml

+21-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
pull_request_rules:
2+
- name: Label conflicting pull requests
3+
description: Add a label to a pull request with conflict to spot it easily
4+
conditions:
5+
- conflict
6+
- '-closed'
7+
actions:
8+
label:
9+
toggle:
10+
- conflict
211
- name: Automatic merge on PullApprove
312
conditions:
413
- or:
5-
- "check-success=pullapprove"
6-
- label="fast track"
7-
- "#approved-reviews-by>=1"
8-
- "#review-threads-unresolved=0"
9-
- "-draft"
10-
- "label!=docker" # Don't auto merge docker images
11-
- "#check-failure=0" # Don't auto merge with a failure
12-
- "#check-pending=0" # Don't auto merge with anything pending
13-
- "check-success~=Build" # Don't auto merge unless a build has succeeded, needed because above is true on a fresh PR before builds
14+
- check-success=pullapprove
15+
- label="fast track"
16+
- '#approved-reviews-by>=1'
17+
- '#review-threads-unresolved=0'
18+
- '-draft'
19+
- label!=docker
20+
- '#check-failure=0'
21+
- '#check-pending=0'
22+
- check-success~=Build
1423
- or:
15-
- "check-success=pullapprove"
16-
- "check-skipped=pullapprove"
17-
- "check-neutral=pullapprove"
24+
- check-success=pullapprove
25+
- check-skipped=pullapprove
26+
- check-neutral=pullapprove
1827
actions:
1928
merge:
2029
method: squash

‎config/beken/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ import("//build_overrides/chip.gni")
2121
#import("${chip_root}/build/chip/tests.gni")
2222

2323
group("beken") {
24-
deps = [
25-
"${chip_root}/examples/lighting-app/beken:MatterApp",
26-
"${chip_root}/src/lib",
27-
]
24+
deps = [ "${chip_root}/src/lib" ]
2825
}
2926
group("default") {
3027
deps = [ ":beken" ]

‎config/esp32/components/chip/CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,13 @@ if(NOT CONFIG_USE_MINIMAL_MDNS)
467467
endif()
468468
endif()
469469

470+
if(CONFIG_OPENTHREAD_BORDER_ROUTER)
471+
idf_component_get_property(rcp_update_lib espressif__esp_rcp_update COMPONENT_LIB)
472+
list(APPEND chip_libraries $<TARGET_FILE:${rcp_update_lib}>)
473+
idf_component_get_property(serial_flasher_lib espressif__esp-serial-flasher COMPONENT_LIB)
474+
list(APPEND chip_libraries $<TARGET_FILE:${serial_flasher_lib}>)
475+
endif()
476+
470477
if (CONFIG_ENABLE_ENCRYPTED_OTA)
471478
idf_component_get_property(esp_encrypted_img_lib espressif__esp_encrypted_img COMPONENT_LIB)
472479
list(APPEND chip_libraries $<TARGET_FILE:${esp_encrypted_img_lib}>)

‎config/esp32/components/chip/idf_component.yml

+5
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,8 @@ dependencies:
2525
rules:
2626
- if: "idf_version >=5.0"
2727
- if: "target != esp32h2"
28+
29+
espressif/esp_rcp_update:
30+
version: "1.0.3"
31+
rules:
32+
- if: "idf_version >=5.0"

0 commit comments

Comments
 (0)