Skip to content

Commit 56d9aaa

Browse files
andy31415andy31415
authored
Merge branch 'master' into feature/generic_switch
2 parents c17383b + 7237d34 commit 56d9aaa

File tree

645 files changed

+69837
-34366
lines changed

Some content is hidden

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

645 files changed

+69837
-34366
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"build": {
1818
"dockerfile": "Dockerfile",
1919
"args": {
20-
"BUILD_VERSION": "0.6.30"
20+
"BUILD_VERSION": "0.6.35"
2121
}
2222
},
2323
"remoteUser": "vscode",

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ diffsyms
416416
dimmable
417417
dirname
418418
dirs
419+
disableNotifyUpdateApplied
419420
disambiguated
420421
discoverable
421422
DispatchEvent

‎.github/workflows/bloat_check.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ jobs:
2727
pull_request_update:
2828
name: Report on pull requests
2929

30+
# Don't run on forked repos
31+
if: github.repository_owner == 'project-chip'
32+
3033
runs-on: ubuntu-latest
3134

3235
container:
33-
image: connectedhomeip/chip-build:0.6.34
36+
image: connectedhomeip/chip-build:0.6.35
3437

3538
steps:
3639
- uses: Wandalen/wretry.action@v1.0.36

‎.github/workflows/build.yaml

+4-20
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: connectedhomeip/chip-build:0.6.34
39+
image: connectedhomeip/chip-build:0.6.35
4040
volumes:
4141
- "/tmp/log_output:/tmp/test_logs"
4242
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -138,7 +138,7 @@ jobs:
138138
if: github.actor != 'restyled-io[bot]'
139139

140140
container:
141-
image: connectedhomeip/chip-build:0.6.34
141+
image: connectedhomeip/chip-build:0.6.35
142142
volumes:
143143
- "/tmp/log_output:/tmp/test_logs"
144144
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -298,7 +298,7 @@ jobs:
298298
if: github.actor != 'restyled-io[bot]'
299299

300300
container:
301-
image: connectedhomeip/chip-build:0.6.34
301+
image: connectedhomeip/chip-build:0.6.35
302302
volumes:
303303
- "/tmp/log_output:/tmp/test_logs"
304304
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -352,12 +352,6 @@ jobs:
352352
timeout-minutes: 200
353353
runs-on: macos-latest
354354
if: github.actor != 'restyled-io[bot]'
355-
356-
env:
357-
# NOTE: Generally kept in sync within the repo using
358-
# scripts/tools/zap/version_update.py
359-
ZAP_VERSION: v2023.01.19-nightly
360-
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
361355

362356
steps:
363357
- uses: Wandalen/wretry.action@v1.0.36
@@ -388,16 +382,6 @@ jobs:
388382
ls -la /usr/local/Cellar/openssl@1.1
389383
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'`
390384
ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* .
391-
- name: Install zap
392-
run: |
393-
sudo mkdir -p $ZAP_INSTALL_PATH
394-
sudo chown `whoami` $ZAP_INSTALL_PATH
395-
curl -L https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-mac.zip \
396-
--output $ZAP_INSTALL_PATH/zap-mac.zip
397-
cd $ZAP_INSTALL_PATH
398-
unzip zap-mac.zip zap-cli
399-
rm zap-mac.zip
400-
./zap-cli --version
401385
- name: Bootstrap
402386
timeout-minutes: 25
403387
run: scripts/build/gn_bootstrap.sh
@@ -471,7 +455,7 @@ jobs:
471455
if: github.actor != 'restyled-io[bot]'
472456

473457
container:
474-
image: connectedhomeip/chip-build:0.6.34
458+
image: connectedhomeip/chip-build:0.6.35
475459
volumes:
476460
- "/tmp/log_output:/tmp/test_logs"
477461
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0

‎.github/workflows/chef.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: github.actor != 'restyled-io[bot]'
3030

3131
container:
32-
image: connectedhomeip/chip-build:0.6.34
32+
image: connectedhomeip/chip-build:0.6.35
3333
options: --user root
3434

3535
steps:
@@ -57,7 +57,7 @@ jobs:
5757
if: github.actor != 'restyled-io[bot]'
5858

5959
container:
60-
image: connectedhomeip/chip-build-esp32:0.6.34
60+
image: connectedhomeip/chip-build-esp32:0.6.35
6161
options: --user root
6262

6363
steps:
@@ -85,7 +85,7 @@ jobs:
8585
if: github.actor != 'restyled-io[bot]'
8686

8787
container:
88-
image: connectedhomeip/chip-build-nrf-platform:0.6.34
88+
image: connectedhomeip/chip-build-nrf-platform:0.6.35
8989
options: --user root
9090

9191
steps:

‎.github/workflows/cirque.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
timeout-minutes: 90
3030

3131
env:
32-
DOCKER_RUN_VERSION: 0.6.34
32+
DOCKER_RUN_VERSION: 0.6.35
3333
GITHUB_CACHE_PATH: /tmp/cirque-cache/
3434

3535
runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
3838
# need to run with privilege, which isn't supported by job.XXX.contaner
3939
# https://github.com/actions/container-action/issues/2
4040
# container:
41-
# image: connectedhomeip/chip-build-cirque:0.6.34
41+
# image: connectedhomeip/chip-build-cirque:0.6.35
4242
# volumes:
4343
# - "/tmp:/tmp"
4444
# - "/dev/pts:/dev/pts"

‎.github/workflows/darwin-tests.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ jobs:
3939
env:
4040
BUILD_VARIANT: ${{matrix.build_variant}}
4141
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
42-
# NOTE: Generally kept in sync within the repo using
43-
# scripts/tools/zap/version_update.py
44-
ZAP_VERSION: v2023.01.19-nightly
45-
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
4642

4743
if: github.actor != 'restyled-io[bot]'
4844
runs-on: macos-latest
@@ -76,16 +72,6 @@ jobs:
7672
ls -la /usr/local/Cellar/openssl@1.1
7773
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'`
7874
ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* .
79-
- name: Install zap
80-
run: |
81-
sudo mkdir -p $ZAP_INSTALL_PATH
82-
sudo chown `whoami` $ZAP_INSTALL_PATH
83-
curl -L https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-mac.zip \
84-
--output $ZAP_INSTALL_PATH/zap-mac.zip
85-
cd $ZAP_INSTALL_PATH
86-
unzip zap-mac.zip zap-cli
87-
rm zap-mac.zip
88-
./zap-cli --version
8975
- name: Bootstrap
9076
timeout-minutes: 25
9177
run: scripts/build/gn_bootstrap.sh

‎.github/workflows/darwin.yaml

+10-34
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,6 @@ jobs:
5252
ls -la /usr/local/Cellar/openssl@1.1
5353
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'`
5454
ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* .
55-
- name: Install zap
56-
run: |
57-
sudo mkdir -p $ZAP_INSTALL_PATH
58-
sudo chown `whoami` $ZAP_INSTALL_PATH
59-
curl -L https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-mac.zip \
60-
--output $ZAP_INSTALL_PATH/zap-mac.zip
61-
cd $ZAP_INSTALL_PATH
62-
unzip zap-mac.zip zap-cli
63-
rm zap-mac.zip
64-
./zap-cli --version
65-
env:
66-
# NOTE: Generally kept in sync within the repo using
67-
# scripts/tools/zap/version_update.py
68-
# This is scoped to only the steps that don't use xcodebuild.
69-
ZAP_VERSION: v2023.01.19-nightly
70-
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
7155
- name: Bootstrap
7256
timeout-minutes: 25
7357
run: scripts/build/gn_bootstrap.sh
@@ -79,6 +63,12 @@ jobs:
7963
path: |
8064
.environment/gn_out/.ninja_log
8165
.environment/pigweed-venv/*.log
66+
- name: Block zap-cli from being used
67+
# xcodebuild is NOT expected to require zap-cli
68+
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'
69+
- name: Validate zap-cli is NOT available
70+
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
71+
run: scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
8272
- name: Run iOS Build Debug
8373
timeout-minutes: 50
8474
working-directory: src/darwin/Framework
@@ -118,36 +108,22 @@ jobs:
118108
- name: Clean Build
119109
run: xcodebuild clean
120110
working-directory: src/darwin/Framework
111+
- name: Make zap-cli work again
112+
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'
113+
- name: Validate zap-cli is again available
114+
run: scripts/run_in_build_env.sh 'zap-cli --version'
121115
- name: Build example All Clusters Server
122116
timeout-minutes: 15
123117
run: |
124118
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
125-
env:
126-
# NOTE: Generally kept in sync within the repo using
127-
# scripts/tools/zap/version_update.py
128-
# This is scoped to only the steps that don't use xcodebuild.
129-
ZAP_VERSION: v2023.01.19-nightly
130-
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
131119
- name: Build example OTA Provider
132120
timeout-minutes: 10
133121
run: |
134122
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
135-
env:
136-
# NOTE: Generally kept in sync within the repo using
137-
# scripts/tools/zap/version_update.py
138-
# This is scoped to only the steps that don't use xcodebuild.
139-
ZAP_VERSION: v2023.01.19-nightly
140-
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
141123
- name: Build example OTA Requestor
142124
timeout-minutes: 10
143125
run: |
144126
scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug chip_config_network_layer_ble=false
145-
env:
146-
# NOTE: Generally kept in sync within the repo using
147-
# scripts/tools/zap/version_update.py
148-
# This is scoped to only the steps that don't use xcodebuild.
149-
ZAP_VERSION: v2023.01.19-nightly
150-
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
151127
- name: Delete Defaults
152128
run: defaults delete com.apple.dt.xctest.tool
153129
continue-on-error: true

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
runs-on: ubuntu-20.04
8484
container:
85-
image: connectedhomeip/chip-build-doxygen:0.6.34
85+
image: connectedhomeip/chip-build-doxygen:0.6.35
8686

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

‎.github/workflows/examples-ameba.yaml

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

3737
container:
38-
image: connectedhomeip/chip-build-ameba:0.6.34
38+
image: connectedhomeip/chip-build-ameba:0.6.35
3939
options: --user root
4040

4141
steps:

‎.github/workflows/examples-bouffalolab.yaml

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

3737
container:
38-
image: connectedhomeip/chip-build-bouffalolab:0.6.34
38+
image: connectedhomeip/chip-build-bouffalolab:0.6.35
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-cc13x2x7_26x2x7.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: connectedhomeip/chip-build-ti:0.6.34
40+
image: connectedhomeip/chip-build-ti:0.6.35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-efr32.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: connectedhomeip/chip-build-efr32:0.6.34
41+
image: connectedhomeip/chip-build-efr32:0.6.35
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: connectedhomeip/chip-build-esp32:0.6.34
37+
image: connectedhomeip/chip-build-esp32:0.6.35
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

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

150150
container:
151-
image: connectedhomeip/chip-build-esp32:0.6.34
151+
image: connectedhomeip/chip-build-esp32:0.6.35
152152
volumes:
153153
- "/tmp/bloat_reports:/tmp/bloat_reports"
154154

‎.github/workflows/examples-infineon.yaml

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

3737
container:
38-
image: connectedhomeip/chip-build-infineon:0.6.34
38+
image: connectedhomeip/chip-build-infineon:0.6.35
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-k32w.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: connectedhomeip/chip-build-k32w:0.6.34
40+
image: connectedhomeip/chip-build-k32w:0.6.35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-linux-arm.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: connectedhomeip/chip-build-crosscompile:0.6.34
37+
image: connectedhomeip/chip-build-crosscompile:0.6.35
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

@@ -73,7 +73,7 @@ jobs:
7373
run: |
7474
./scripts/run_in_build_env.sh \
7575
"./scripts/build/build_examples.py \
76-
--target linux-arm64-chip-cert \
76+
--target linux-arm64-chip-cert-clang \
7777
--target linux-arm64-all-clusters-clang \
7878
--target linux-arm64-chip-tool-ipv6only-clang \
7979
--target linux-arm64-lock-clang \

‎.github/workflows/examples-linux-imx.yaml

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

3636
container:
37-
image: connectedhomeip/chip-build-imx:0.6.34
37+
image: connectedhomeip/chip-build-imx:0.6.35
3838

3939
steps:
4040
- uses: Wandalen/wretry.action@v1.0.36

‎.github/workflows/examples-linux-standalone.yaml

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

3636
container:
37-
image: connectedhomeip/chip-build:0.6.34
37+
image: connectedhomeip/chip-build:0.6.35
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

‎.github/workflows/examples-mbed.yaml

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

4242
container:
43-
image: connectedhomeip/chip-build-mbed-os:0.6.34
43+
image: connectedhomeip/chip-build-mbed-os:0.6.35
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

‎.github/workflows/examples-mw320.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: connectedhomeip/chip-build:0.6.34
40+
image: connectedhomeip/chip-build:0.6.35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-nrfconnect.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: connectedhomeip/chip-build-nrf-platform:0.6.34
40+
image: connectedhomeip/chip-build-nrf-platform:0.6.35
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

0 commit comments

Comments
 (0)