Skip to content

Commit

Permalink
Merge branch 'master' into nullptr-ble-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
arkq authored Dec 19, 2022
2 parents 1856dc2 + 04c20f6 commit 325e166
Show file tree
Hide file tree
Showing 1,895 changed files with 112,827 additions and 75,072 deletions.
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Checks: >
readability-redundant-control-flow,
readability-redundant-string-cstr,
readability-redundant-string-init,
-bugprone-assignment-in-if-condition,
-bugprone-branch-clone,
-bugprone-copy-constructor-init,
-bugprone-easily-swappable-parameters,
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.6.06"
"BUILD_VERSION": "0.6.18"
}
},
"remoteUser": "vscode",
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ src/controller/python/chip/clusters/CHIPClusters.py linguist-generated
src/controller/python/chip/clusters/Objects.py linguist-generated
# Let bat file use CRLF linebreak
**/*.bat eol=crlf
# Mark Matter operational certificate/key files as binary
**/*.chip binary
16 changes: 12 additions & 4 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ backtrace
BallastConfiguration
BarrierControl
BasicCHIPRegression
BasicInformation
baudrate
BD
BDX
Expand Down Expand Up @@ -292,15 +293,16 @@ connstring
conntype
const
ContentApp
ContentAppPlatform
ContentApp's
ContentAppPlatform
ContentLaunch
ContentLauncher
continuousHinting
contrib
controllee
conv
CopperConcentrationMeasurement
Corstone
cortexa
cp
cpio
Expand Down Expand Up @@ -676,7 +678,6 @@ instantiation
integrations
IntelliSense
InteractionModelVersion
Interation
Interoperable
introvideos
InvokeCommandRequests
Expand Down Expand Up @@ -886,6 +887,7 @@ MyPASSWORD
MySSID
NAMESERVER
NAMESPACE
namespaces
namespacing
nano
natively
Expand Down Expand Up @@ -1119,8 +1121,8 @@ REPL
repo
req
Requestor
RequestorCanConsent
Requestor's
RequestorCanConsent
Requestors
responder
RestrictedEvent
Expand All @@ -1144,11 +1146,13 @@ rsn
RSSI
RST
rsync
RTC
rtd
RTL
rtld
RTOS
RTT
RTX
RUNAS
RunMain
runtime
Expand All @@ -1167,8 +1171,8 @@ SDB
SDC
SDHC
SDK
sdkconfig
SDK's
sdkconfig
SDKs
SDKTARGETSYSROOT
sdl
Expand Down Expand Up @@ -1196,6 +1200,7 @@ sexualized
sfv
SHA
ShadeConfiguration
SHAs
showDocumentation
shubhamdp
SIGINT
Expand Down Expand Up @@ -1254,6 +1259,7 @@ subdirectory
subfolder
submodule
submodules
subnet
subprocess
SubscribeResponse
SubscriptionId
Expand Down Expand Up @@ -1319,11 +1325,13 @@ ths
Thunderboard
timedInteractionTimeoutMs
TimeFormatLocalization
timeframe
timeoutMs
TimeSynchronization
tinycrypt
Tizen
TKIP
TLS
tlsr
TLV
tmp
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/1-bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: input
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/100-documentation-issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ body:
2.
3.
...
render: bash
validations:
required: true
- type: dropdown
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/2-1.0-issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: input
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: input
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/50-tooling-fix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps / Feature
description: "How do you trigger this issue and/or can you please explain this new feature? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: dropdown
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/60-platform-fix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this issue? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: dropdown
Expand Down
6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/70-trivial-fix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ body:
attributes:
label: Explanation
description: "(Optional) If other, why do you think this is trivial?"
value: |
1.
2.
3.
...
render: bash
validations:
required: false
- type: dropdown
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/80-feature-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ body:
description: "What feature are you looking to add? Please walk us through it!"
value: |
...
render: bash
validations:
required: true
- type: dropdown
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ body:
2.
3.
...
render: bash
validations:
required: true
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18

steps:
- uses: Wandalen/[email protected]
Expand Down
40 changes: 30 additions & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ concurrency:
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
cancel-in-progress: true

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:

build_linux_gcc_debug:
name: Build on Linux (gcc_debug)
timeout-minutes: 85
Expand All @@ -32,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -74,7 +78,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Setup Build
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=true"
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
- name: Run Build
timeout-minutes: 20
run: scripts/run_in_build_env.sh "ninja -C ./out"
Expand Down Expand Up @@ -125,6 +129,7 @@ jobs:
# path: out/
# # objdirs are big; don't hold on to them too long.
# retention-days: 5

build_linux:
name: Build on Linux (fake, gcc_release, clang, simulated)
timeout-minutes: 150
Expand All @@ -133,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -219,7 +224,6 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/run-clang-tidy-on-compile-commands.py \
--no-log-timestamps \
--compile-database out/sanitizers/compile_commands.json \
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/' \
check \
Expand All @@ -228,18 +232,34 @@ jobs:
timeout-minutes: 60
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps \
--target linux-x64-all-clusters-ipv6only-clang \
--target linux-x64-chip-tool-ipv6only-clang \
"./scripts/build/build_examples.py \
--target linux-x64-minmdns-ipv6only-clang \
--target linux-x64-rpc-console \
build \
"
- name: Create a pre-generate directory and ensure compile-time codegen would fail
run: |
./scripts/run_in_build_env.sh "./scripts/codepregen.py ./zzz_pregenerated"
mv scripts/codegen.py scripts/codegen.py.renamed
- name: Build using build_examples.py (pregen)
timeout-minutes: 60
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target linux-x64-all-clusters-ipv6only-clang \
--target linux-x64-chip-tool-ipv6only-clang \
--pregen-dir ./zzz_pregenerated \
build \
"
- name: Undo code pre-generation changes (make compile time codegen work again)
run: |
rm -rf ./zzz_pregenerated
mv scripts/codegen.py.renamed scripts/codegen.py
- name: Run fake linux tests with build_examples
timeout-minutes: 15
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target linux-fake-tests build"
"./scripts/build/build_examples.py --target linux-fake-tests build"
- name: Uploading core files
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
Expand Down Expand Up @@ -279,6 +299,7 @@ jobs:
# - name: Perform CodeQL Analysis
# if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
# uses: github/codeql-action/analyze@v1

build_linux_python_lib:
name: Build on Linux (python_lib)
timeout-minutes: 60
Expand All @@ -287,7 +308,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -414,7 +435,6 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/run-clang-tidy-on-compile-commands.py \
--no-log-timestamps \
--compile-database out/default/compile_commands.json \
check \
"
Expand Down
Loading

0 comments on commit 325e166

Please sign in to comment.