Skip to content

Commit 0fc61d6

Browse files
wqx6wqx6
authored
Merge branch 'master' into thread-br-mgmt/app
2 parents 1bf362e + ea01e21 commit 0fc61d6

File tree

665 files changed

+43903
-12205
lines changed

Some content is hidden

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

665 files changed

+43903
-12205
lines changed

‎.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

‎.github/stale.yml

-42
This file was deleted.

‎.github/workflows/build.yaml

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

140140
container:
141-
image: ghcr.io/project-chip/chip-build:54
141+
image: ghcr.io/project-chip/chip-build:65
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/qemu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232

3333
qemu-esp32:

‎.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

+4-104
Large diffs are not rendered by default.

‎.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

‎.restyled.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ exclude:
7272
- "scripts/tools/zap/tests/outputs/**/*" # Matches generated output 1:1
7373
- "examples/chef/sample_app_util/test_files/*.yaml"
7474
- "examples/chef/zzz_generated/**/*"
75-
- "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
7675
- "examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/*" # zap-generated files
7776
- "integrations/cloudbuild/*.yaml" # uglier long command line content
7877
- "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs

‎.vscode/settings.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@
134134
"thread": "cpp",
135135
"variant": "cpp",
136136
"any": "cpp",
137-
"future": "cpp"
137+
"future": "cpp",
138+
"list": "cpp",
139+
"unordered_set": "cpp"
138140
},
139141
// Configure paths or glob patterns to exclude from file watching.
140142
"files.watcherExclude": {

‎BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -689,23 +689,23 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
689689

690690
if (enable_k32w_lighting_app_build) {
691691
group("k32w_lighting_app") {
692-
deps = [ "${chip_root}/examples/lighting-app/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lighting_app)" ]
692+
deps = [ "${chip_root}/examples/lighting-app/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lighting_app)" ]
693693
}
694694

695695
extra_build_deps += [ ":k32w_lighting_app" ]
696696
}
697697

698698
if (enable_k32w_lock_app_build) {
699699
group("k32w_lock_app") {
700-
deps = [ "${chip_root}/examples/lock-app/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lock_app)" ]
700+
deps = [ "${chip_root}/examples/lock-app/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lock_app)" ]
701701
}
702702

703703
extra_build_deps += [ ":k32w_lock_app" ]
704704
}
705705

706706
if (enable_k32w_shell_app_build) {
707707
group("k32w_shell_app") {
708-
deps = [ "${chip_root}/examples/shell/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_shell_app)" ]
708+
deps = [ "${chip_root}/examples/shell/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_shell_app)" ]
709709
}
710710

711711
extra_build_deps += [ ":k32w_shell_app" ]

‎build/config/compiler/BUILD.gn

+6-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,11 @@ config("warnings_third_party") {
334334
}
335335

336336
config("symbols_default") {
337-
cflags = [ "-g${symbol_level}" ]
337+
if (strip_symbols) {
338+
cflags = [ "-s" ]
339+
} else {
340+
cflags = [ "-g${symbol_level}" ]
341+
}
338342
}
339343

340344
config("std_default") {
@@ -489,6 +493,7 @@ config("libfuzzer_fuzzing") {
489493

490494
config("oss_fuzz") {
491495
cflags = string_split(getenv("CFLAGS"))
496+
cflags_cc = string_split(getenv("CXXFLAGS"))
492497
ldflags = string_split(getenv("CXXFLAGS"))
493498
ldflags += [ getenv("LIB_FUZZING_ENGINE") ]
494499
}

‎build/config/compiler/compiler.gni

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ declare_args() {
3030
symbol_level = 2
3131

3232
# Enable position independent code (-fPIC).
33-
enable_pic =
34-
current_os == "linux" || current_os == "mac" || current_os == "android"
33+
enable_pic = current_os == "linux" || current_os == "mac" ||
34+
current_os == "android" || current_os == "tizen"
3535

3636
# Enable position independent executables (-pie).
37-
enable_pie = current_os == "linux"
37+
enable_pie = current_os == "linux" || current_os == "tizen"
3838

3939
# Remove unwind tables from the binary to save space.
4040
exclude_unwind_tables = current_os != "android"
@@ -48,6 +48,9 @@ declare_args() {
4848
# enable libfuzzer
4949
is_libfuzzer = false
5050

51+
# Remove all symbol table and relocation information from the binary.
52+
strip_symbols = false
53+
5154
# Generate code coverage analysis artifacts when enabled.
5255
use_coverage = false
5356

‎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/k32w/toolchain/BUILD.gn

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
2020
arm_toolchain("k32w_lighting_app") {
2121
toolchain_args = {
2222
current_os = "freertos"
23-
import("${chip_root}/examples/lighting-app/nxp/k32w/k32w0/args.gni")
23+
import("${chip_root}/examples/lighting-app/nxp/k32w0/args.gni")
2424
}
2525
}
2626

2727
arm_toolchain("k32w_lock_app") {
2828
toolchain_args = {
2929
current_os = "freertos"
30-
import("${chip_root}/examples/lock-app/nxp/k32w/k32w0/args.gni")
30+
import("${chip_root}/examples/lock-app/nxp/k32w0/args.gni")
3131
}
3232
}
3333

3434
arm_toolchain("k32w_contact_sensor_app") {
3535
toolchain_args = {
3636
current_os = "freertos"
37-
import("${chip_root}/examples/contact-sensor-app/nxp/k32w/k32w0/args.gni")
37+
import("${chip_root}/examples/contact-sensor-app/nxp/k32w0/args.gni")
3838
}
3939
}
4040

4141
arm_toolchain("k32w_shell_app") {
4242
toolchain_args = {
4343
current_os = "freertos"
44-
import("${chip_root}/examples/shell/nxp/k32w/k32w0/args.gni")
44+
import("${chip_root}/examples/shell/nxp/k32w0/args.gni")
4545
}
4646
}

0 commit comments

Comments
 (0)