Skip to content

Commit 6c53a6a

Browse files
authored
Merge branch 'project-chip:master' into initialization_fiasco
2 parents 7b9c3a7 + 511c974 commit 6c53a6a

File tree

1,434 files changed

+41856
-34139
lines changed

Some content is hidden

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

1,434 files changed

+41856
-34139
lines changed

.github/.wordlist.txt

+12
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ DelayedActionTime
369369
delayedApplyActionTimeSec
370370
delayedQueryActionTimeSec
371371
delayQuery
372+
deliverables
372373
demangle
373374
deployable
374375
depottools
@@ -585,6 +586,8 @@ GenericWiFiConfigurationManagerImpl
585586
GetDeviceId
586587
GetDeviceInfo
587588
GetDns
589+
getter
590+
getters
588591
GetInDevelopmentTests
589592
GetIP
590593
getManualTests
@@ -643,6 +646,8 @@ HomePods
643646
hostapd
644647
hostname
645648
href
649+
HSM
650+
hsm
646651
HTTPS
647652
HW
648653
hwadr
@@ -725,6 +730,7 @@ JLink
725730
JLinkExe
726731
JLinkRTTClient
727732
JN
733+
jni
728734
jpg
729735
jre
730736
js
@@ -905,6 +911,7 @@ Multicast
905911
multilib
906912
Multiprotocol
907913
multithreaded
914+
mutex
908915
mutexes
909916
mv
910917
MX
@@ -934,6 +941,7 @@ nfds
934941
NitricOxideConcentrationMeasurement
935942
NitrogenDioxideConcentrationMeasurement
936943
nl
944+
nltest
937945
NLUnitTest
938946
NLUnitTests
939947
nmcli
@@ -965,6 +973,7 @@ objcopy
965973
OccupancySensing
966974
OctetString
967975
OECORE
976+
OID
968977
ol
969978
Onboarding
970979
onboardingcodes
@@ -986,6 +995,7 @@ openweave
986995
OperationalCredentials
987996
operationalDataset
988997
opkg
998+
OPTIGA
989999
optionMask
9901000
optionOverride
9911001
optionsMask
@@ -1429,6 +1439,7 @@ transitionTime
14291439
TransportMgrBase
14301440
TriggerEffect
14311441
TRNG
1442+
trustm
14321443
TrustedRootCertificates
14331444
tsan
14341445
TSG
@@ -1494,6 +1505,7 @@ utils
14941505
UUID
14951506
ux
14961507
validator
1508+
valgrind
14971509
vcom
14981510
VCP
14991511
Vectorcall

.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:41
37+
image: ghcr.io/project-chip/chip-build:47
3838

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Builds
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123
workflow_dispatch:
@@ -40,7 +42,7 @@ jobs:
4042
if: github.actor != 'restyled-io[bot]'
4143

4244
container:
43-
image: ghcr.io/project-chip/chip-build:41
45+
image: ghcr.io/project-chip/chip-build:47
4446
volumes:
4547
- "/:/runner-root-volume"
4648
- "/tmp/log_output:/tmp/test_logs"
@@ -136,7 +138,7 @@ jobs:
136138
if: github.actor != 'restyled-io[bot]'
137139

138140
container:
139-
image: ghcr.io/project-chip/chip-build:41
141+
image: ghcr.io/project-chip/chip-build:47
140142
volumes:
141143
- "/:/runner-root-volume"
142144
- "/tmp/log_output:/tmp/test_logs"
@@ -279,7 +281,7 @@ jobs:
279281
if: github.actor != 'restyled-io[bot]'
280282

281283
container:
282-
image: ghcr.io/project-chip/chip-build:41
284+
image: ghcr.io/project-chip/chip-build:47
283285
volumes:
284286
- "/:/runner-root-volume"
285287
- "/tmp/log_output:/tmp/test_logs"
@@ -340,7 +342,7 @@ jobs:
340342
if: github.actor != 'restyled-io[bot]'
341343

342344
container:
343-
image: ghcr.io/project-chip/chip-build:41
345+
image: ghcr.io/project-chip/chip-build:47
344346
volumes:
345347
- "/:/runner-root-volume"
346348
- "/tmp/log_output:/tmp/test_logs"
@@ -449,7 +451,7 @@ jobs:
449451
if: github.actor != 'restyled-io[bot]'
450452

451453
container:
452-
image: ghcr.io/project-chip/chip-build:41
454+
image: ghcr.io/project-chip/chip-build:47
453455
volumes:
454456
- "/:/runner-root-volume"
455457
- "/tmp/log_output:/tmp/test_logs"

.github/workflows/chef.yaml

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build Chef CI examples on all platforms
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

@@ -33,7 +35,7 @@ jobs:
3335
if: github.actor != 'restyled-io[bot]'
3436

3537
container:
36-
image: ghcr.io/project-chip/chip-build:41
38+
image: ghcr.io/project-chip/chip-build:47
3739
options: --user root
3840

3941
steps:
@@ -54,7 +56,7 @@ jobs:
5456
if: github.actor != 'restyled-io[bot]'
5557

5658
container:
57-
image: ghcr.io/project-chip/chip-build-esp32:41
59+
image: ghcr.io/project-chip/chip-build-esp32:47
5860
options: --user root
5961

6062
steps:
@@ -75,7 +77,7 @@ jobs:
7577
if: github.actor != 'restyled-io[bot]'
7678

7779
container:
78-
image: ghcr.io/project-chip/chip-build-nrf-platform:41
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:47
7981
options: --user root
8082

8183
steps:
@@ -96,7 +98,7 @@ jobs:
9698
if: github.actor != 'restyled-io[bot]'
9799

98100
container:
99-
image: ghcr.io/project-chip/chip-build-telink:41
101+
image: ghcr.io/project-chip/chip-build-telink:47
100102
options: --user root
101103

102104
steps:
@@ -108,7 +110,7 @@ jobs:
108110
platform: telink
109111
# - name: Update Zephyr to specific revision (for developers purpose)
110112
# shell: bash
111-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
113+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 65dc1812431bf946dfc110682298acf83d63e27a"
112114
- name: CI Examples Telink
113115
shell: bash
114116
run: |

.github/workflows/cirque.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Cirque
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123
workflow_dispatch:
@@ -40,7 +42,7 @@ jobs:
4042
# need to run with privilege, which isn't supported by job.XXX.contaner
4143
# https://github.com/actions/container-action/issues/2
4244
# container:
43-
# image: ghcr.io/project-chip/chip-build-cirque:41
45+
# image: ghcr.io/project-chip/chip-build-cirque:47
4446
# volumes:
4547
# - "/tmp:/tmp"
4648
# - "/dev/pts:/dev/pts"

.github/workflows/darwin-tests.yaml

+3-9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Darwin Tests
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123
workflow_dispatch:
@@ -72,15 +74,7 @@ jobs:
7274

7375
- name: Run macOS Darwin Framework Tool Build Debug
7476
working-directory: src/darwin/Framework
75-
# Keep whatever Xcode settings
76-
# for OTHER_CFLAGS exist by using ${inherited}.
77-
#
78-
# Enable -Wconversion by hand as well, because it seems to not be
79-
# enabled by default in the Xcode config.
80-
#
81-
# Disable availability annotations, since we are not building against a system
82-
# Matter.framework.
83-
run: xcodebuild -target "darwin-framework-tool" -sdk macosx -configuration Debug OTHER_CFLAGS='${inherited} -Wconversion' GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'
77+
run: xcodebuild -target "darwin-framework-tool" -sdk macosx -configuration Debug
8478
- name: Delete Defaults
8579
run: defaults delete com.apple.dt.xctest.tool
8680
continue-on-error: true

.github/workflows/darwin.yaml

+27-39
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ name: Darwin
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- "dependabot/**"
1921
pull_request:
2022
merge_group:
2123
workflow_dispatch:
2224

2325
concurrency:
24-
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
26+
group:
27+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
28+
'pull_request' && github.event.number) || (github.event_name ==
29+
'workflow_dispatch' && github.run_number) || github.sha }}
2530
cancel-in-progress: true
2631

2732
env:
@@ -35,49 +40,47 @@ jobs:
3540
strategy:
3641
matrix:
3742
options: # We don't need a full matrix
38-
- flavor: macos-release-availability
39-
arguments: -sdk macosx -configuration Release WARNING_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new'
43+
- flavor: macos-release
44+
arguments: -sdk macosx -configuration Release
4045
- flavor: ios-release
41-
arguments: -sdk iphoneos -configuration Release WARNING_CFLAGS='${inherited} -Werror -Wconversion' GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'
42-
- flavor: ios-debug
43-
arguments: -sdk iphoneos -configuration Debug WARNING_CFLAGS='${inherited} -Werror -Wconversion' GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'
46+
arguments: -sdk iphoneos -configuration Release
4447
- flavor: tvos-debug
45-
arguments: -sdk appletvos -configuration Debug WARNING_CFLAGS='${inherited} -Werror -Wconversion' GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'
48+
arguments: -sdk appletvos -configuration Debug
4649
- flavor: watchos-debug
47-
arguments: -sdk watchos -configuration Debug WARNING_CFLAGS='${inherited} -Werror -Wconversion' GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'
50+
arguments: -sdk watchos -configuration Debug
4851
steps:
4952
- name: Checkout
5053
uses: actions/checkout@v4
5154
- name: Checkout submodules & Bootstrap
5255
uses: ./.github/actions/checkout-submodules-and-bootstrap
5356
with:
54-
platform: darwin
55-
bootstrap-log-name: bootstrap-logs-framework-${{ matrix.options.flavor }}
57+
platform: darwin
58+
bootstrap-log-name:
59+
bootstrap-logs-framework-${{ matrix.options.flavor }}
5660
- name: Block zap-cli from being used
5761
env:
58-
PW_ENVSETUP_NO_BANNER: 1
62+
PW_ENVSETUP_NO_BANNER: 1
5963
run: |
60-
# Framework builds are NOT expected to require zap-cli
61-
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
62-
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
63-
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
64+
# Framework builds are NOT expected to require zap-cli
65+
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
66+
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
67+
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
6468
- name: Build
6569
working-directory: src/darwin/Framework
6670
run: xcodebuild -target "Matter" ${{ matrix.options.arguments }}
6771

6872
tests:
6973
name: Run framework tests
7074
if: github.actor != 'restyled-io[bot]'
71-
needs: [ framework ] # serialize to avoid running to many parallel macos runners
75+
needs: [framework] # serialize to avoid running to many parallel macos runners
7276
runs-on: macos-13
7377
strategy:
7478
matrix:
7579
options: # We don't need a full matrix
7680
- flavor: asan
77-
arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
78-
- flavor: asan-global-storage
79-
arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
80-
defines: MTR_PER_CONTROLLER_STORAGE_ENABLED=0
81+
arguments:
82+
-enableAddressSanitizer YES
83+
-enableUndefinedBehaviorSanitizer YES
8184
- flavor: tsan
8285
arguments: -enableThreadSanitizer YES
8386
steps:
@@ -86,8 +89,9 @@ jobs:
8689
- name: Checkout submodules & Bootstrap
8790
uses: ./.github/actions/checkout-submodules-and-bootstrap
8891
with:
89-
platform: darwin
90-
bootstrap-log-name: bootstrap-logs-framework-${{ matrix.options.flavor }}
92+
platform: darwin
93+
bootstrap-log-name:
94+
bootstrap-logs-framework-${{ matrix.options.flavor }}
9195
- name: Build example All Clusters Server
9296
run: |
9397
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
@@ -113,7 +117,7 @@ jobs:
113117
114118
# Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
115119
xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx ${{ matrix.options.arguments }} \
116-
OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 ${{ matrix.options.defines }}' \
120+
CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
117121
> >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
118122
- name: Collect crash logs
119123
if: failure() && !env.ACT
@@ -127,19 +131,3 @@ jobs:
127131
name: darwin-framework-test-logs-${{ matrix.options.flavor }}
128132
path: /tmp/darwin/framework-tests
129133
retention-days: 5
130-
131-
tv-casting-bridge:
132-
name: Build TV Casting Bridge example
133-
if: github.actor != 'restyled-io[bot]'
134-
needs: [ framework ] # serialize to avoid running to many parallel macos runners
135-
runs-on: macos-13
136-
steps:
137-
- name: Checkout
138-
uses: actions/checkout@v4
139-
- name: Checkout submodules & Bootstrap
140-
uses: ./.github/actions/checkout-submodules-and-bootstrap
141-
with:
142-
platform: darwin
143-
- name: Build
144-
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
145-
run: xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos

.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:41
84+
image: ghcr.io/project-chip/chip-build-doxygen:47
8585

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

0 commit comments

Comments
 (0)