Skip to content

Commit

Permalink
Merge branch 'master' into updateUI
Browse files Browse the repository at this point in the history
  • Loading branch information
jeonghwan7 authored Feb 6, 2023
2 parents 133eaf2 + 655d134 commit f8ff17c
Show file tree
Hide file tree
Showing 1,646 changed files with 153,337 additions and 99,234 deletions.
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.30"
"BUILD_VERSION": "0.6.35"
}
},
"remoteUser": "vscode",
Expand Down
5 changes: 4 additions & 1 deletion .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ bouffalolab
BRD
breakpoint
bredr
BridgedDeviceBasic
BridgedDeviceBasicInformation
bridgedLightEndpoint
bringup
BromateConcentrationMeasurement
Expand Down Expand Up @@ -416,6 +416,7 @@ diffsyms
dimmable
dirname
dirs
disableNotifyUpdateApplied
disambiguated
discoverable
DispatchEvent
Expand Down Expand Up @@ -1209,6 +1210,7 @@ Silabs's
SiliconLabs
SimpleFileExFlags
SimpleLink
SiWx
sizedb
sl
SLAAC
Expand Down Expand Up @@ -1454,6 +1456,7 @@ wic
WiFiNetworkDiagnostics
WindowCovering
WindowCoveringGoToLiftPercentage
WiseMCU
wlan
wmm
WPA
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ jobs:
pull_request_update:
name: Report on pull requests

# Don't run on forked repos
if: github.repository_owner == 'project-chip'

runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.6.31
image: connectedhomeip/chip-build:0.6.35

steps:
- uses: Wandalen/[email protected]
Expand Down
24 changes: 4 additions & 20 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.31
image: connectedhomeip/chip-build:0.6.35
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.31
image: connectedhomeip/chip-build:0.6.35
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -298,7 +298,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.31
image: connectedhomeip/chip-build:0.6.35
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -352,12 +352,6 @@ jobs:
timeout-minutes: 200
runs-on: macos-latest
if: github.actor != 'restyled-io[bot]'

env:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
ZAP_VERSION: v2023.01.09-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.09-nightly

steps:
- uses: Wandalen/[email protected]
Expand Down Expand Up @@ -388,16 +382,6 @@ jobs:
ls -la /usr/local/Cellar/[email protected]
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'`
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* .
- name: Install zap
run: |
sudo mkdir -p $ZAP_INSTALL_PATH
sudo chown `whoami` $ZAP_INSTALL_PATH
curl -L https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-mac.zip \
--output $ZAP_INSTALL_PATH/zap-mac.zip
cd $ZAP_INSTALL_PATH
unzip zap-mac.zip zap-cli
rm zap-mac.zip
./zap-cli --version
- name: Bootstrap
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
Expand Down Expand Up @@ -471,7 +455,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.31
image: connectedhomeip/chip-build:0.6.35
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.31
image: connectedhomeip/chip-build:0.6.35
options: --user root

steps:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.6.31
image: connectedhomeip/chip-build-esp32:0.6.35
options: --user root

steps:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.6.31
image: connectedhomeip/chip-build-nrf-platform:0.6.35
options: --user root

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
timeout-minutes: 90

env:
DOCKER_RUN_VERSION: 0.6.31
DOCKER_RUN_VERSION: 0.6.35
GITHUB_CACHE_PATH: /tmp/cirque-cache/

runs-on: ubuntu-latest
Expand All @@ -38,7 +38,7 @@ jobs:
# need to run with privilege, which isn't supported by job.XXX.contaner
# https://github.com/actions/container-action/issues/2
# container:
# image: connectedhomeip/chip-build-cirque:0.6.31
# image: connectedhomeip/chip-build-cirque:0.6.35
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ jobs:
env:
BUILD_VARIANT: ${{matrix.build_variant}}
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
ZAP_VERSION: v2023.01.09-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.09-nightly

if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
Expand Down Expand Up @@ -76,16 +72,6 @@ jobs:
ls -la /usr/local/Cellar/[email protected]
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'`
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* .
- name: Install zap
run: |
sudo mkdir -p $ZAP_INSTALL_PATH
sudo chown `whoami` $ZAP_INSTALL_PATH
curl -L https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-mac.zip \
--output $ZAP_INSTALL_PATH/zap-mac.zip
cd $ZAP_INSTALL_PATH
unzip zap-mac.zip zap-cli
rm zap-mac.zip
./zap-cli --version
- name: Bootstrap
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
Expand Down
26 changes: 10 additions & 16 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ jobs:
if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest

env:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
ZAP_VERSION: v2023.01.09-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.09-nightly

steps:
- uses: Wandalen/[email protected]
name: Checkout
Expand All @@ -58,16 +52,6 @@ jobs:
ls -la /usr/local/Cellar/[email protected]
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'`
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* .
- name: Install zap
run: |
sudo mkdir -p $ZAP_INSTALL_PATH
sudo chown `whoami` $ZAP_INSTALL_PATH
curl -L https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-mac.zip \
--output $ZAP_INSTALL_PATH/zap-mac.zip
cd $ZAP_INSTALL_PATH
unzip zap-mac.zip zap-cli
rm zap-mac.zip
./zap-cli --version
- name: Bootstrap
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
Expand All @@ -79,6 +63,12 @@ jobs:
path: |
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Block zap-cli from being used
# xcodebuild is NOT expected to require zap-cli
run: scripts/run_in_build_env.sh 'mv $PW_ENVIRONMENT_ROOT/cipd/packages/zap/zap-cli $PW_ENVIRONMENT_ROOT/cipd/packages/zap/zap-cli.moved'
- name: Validate zap-cli is NOT available
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
run: scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
- name: Run iOS Build Debug
timeout-minutes: 50
working-directory: src/darwin/Framework
Expand Down Expand Up @@ -118,6 +108,10 @@ jobs:
- name: Clean Build
run: xcodebuild clean
working-directory: src/darwin/Framework
- name: Make zap-cli work again
run: scripts/run_in_build_env.sh 'mv $PW_ENVIRONMENT_ROOT/cipd/packages/zap/zap-cli.moved $PW_ENVIRONMENT_ROOT/cipd/packages/zap/zap-cli'
- name: Validate zap-cli is again available
run: scripts/run_in_build_env.sh 'zap-cli --version'
- name: Build example All Clusters Server
timeout-minutes: 15
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker_img.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
- "-telink"
- "-ti"
- "-tizen"
- "-tizen-qemu"
- "-openiotsdk"
# NOTE: vscode image consumes ~52 GB disk space but GitHub-hosted runners provide ~10 GB free disk space(https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources)
#- "-vscode"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build-doxygen:0.6.31
image: connectedhomeip/chip-build-doxygen:0.6.35

if: github.actor != 'restyled-io[bot]'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ameba:0.6.31
image: connectedhomeip/chip-build-ameba:0.6.35
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-bouffalolab:0.6.31
image: connectedhomeip/chip-build-bouffalolab:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc13x2x7_26x2x7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ti:0.6.31
image: connectedhomeip/chip-build-ti:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-efr32:0.6.31
image: connectedhomeip/chip-build-efr32:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand All @@ -51,7 +51,7 @@ jobs:
attempt_limit: 3
attempt_delay: 2000
- name: Checkout submodules
run: scripts/checkout_submodules.py --shallow --recursive --platform efr32
run: scripts/checkout_submodules.py --shallow --platform efr32

# - name: Out of Tree verification
# run: third_party/silabs/out_of_tree_verification.sh
Expand Down Expand Up @@ -82,6 +82,7 @@ jobs:
--enable-flashbundle \
--target efr32-brd4187c-window-covering \
--target efr32-brd4187c-switch \
--target efr32-brd4187c-switch-sed \
--target efr32-brd4187c-unit-test \
--target efr32-brd4187c-light \
--target efr32-brd4187c-light-rpc \
Expand All @@ -101,15 +102,6 @@ jobs:
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build example EFR32 Lighting App for BRD4161A with RPCs
timeout-minutes: 15
run: |
scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_debug_rpc BRD4161A "is_debug=false" \
disable_lcd=true 'import("//with_pw_rpc.gni")'
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \
out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
timeout-minutes: 15
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.6.31
image: connectedhomeip/chip-build-esp32:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.6.31
image: connectedhomeip/chip-build-esp32:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-infineon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-infineon:0.6.31
image: connectedhomeip/chip-build-infineon:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-k32w.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-k32w:0.6.31
image: connectedhomeip/chip-build-k32w:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-crosscompile:0.6.31
image: connectedhomeip/chip-build-crosscompile:0.6.35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target linux-arm64-chip-cert \
--target linux-arm64-chip-cert-clang \
--target linux-arm64-all-clusters-clang \
--target linux-arm64-chip-tool-ipv6only-clang \
--target linux-arm64-lock-clang \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-imx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-imx:0.6.31
image: connectedhomeip/chip-build-imx:0.6.35

steps:
- uses: Wandalen/[email protected]
Expand Down
Loading

0 comments on commit f8ff17c

Please sign in to comment.