Skip to content

Commit

Permalink
Merge branch 'master' into im/subscribe-handler-app-callback
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjerryjohns committed Mar 28, 2022
2 parents 152f28c + 125e73c commit 1ad2d83
Show file tree
Hide file tree
Showing 373 changed files with 160,261 additions and 16,203 deletions.
5 changes: 5 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@ OTADownloader
otaDownloadPath
otaImageList
OTAImageProcessorDriver
OTAImageProcessorImpl
OTAImageProcessorInterface
OTAProvider
OTAProviderIpAddress
Expand Down Expand Up @@ -1176,6 +1177,7 @@ SulfurDioxideConcentrationMeasurement
svg
SVR
SWD
SWU
symlinks
sysconfdir
SysConfig
Expand Down Expand Up @@ -1248,6 +1250,7 @@ TotalTrihalomethanesConcentrationMeasurement
trackAlloc
trackFree
transitionTime
TransferSession
TransportMgrBase
TrustedRootCertificates
TSG
Expand Down Expand Up @@ -1354,12 +1357,14 @@ xab
xaver
xb
xbef
xBEEF
xc
xcd
Xcode
xcodeproj
xcworkspace
xd
xDEAD
xDEADBEEF
xdeadbeefcafe
xds
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ jobs:
run: xcodebuild clean
working-directory: src/darwin/Framework
- name: Build example chip-tool-darwin
timeout-minutes: 10
timeout-minutes: 15
run: |
scripts/examples/gn_build_example.sh examples/chip-tool-darwin out/debug chip_config_network_layer_ble=false is_asan=true
- name: Build example All Clusters Server
timeout-minutes: 10
timeout-minutes: 15
run: |
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
- name: Build example OTA Provider
Expand All @@ -110,7 +110,7 @@ jobs:
run: defaults delete com.apple.dt.xctest.tool
continue-on-error: true
- name: Run Framework Tests
timeout-minutes: 10
timeout-minutes: 15
run: |
mkdir -p /tmp/darwin/framework-tests
../../../out/debug/chip-all-clusters-app > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
Expand Down
23,679 changes: 23,679 additions & 0 deletions cluster/Commands.h

Large diffs are not rendered by default.

2,208 changes: 2,208 additions & 0 deletions cluster/ComplexArgumentParser.cpp

Large diffs are not rendered by default.

251 changes: 251 additions & 0 deletions cluster/ComplexArgumentParser.h

Large diffs are not rendered by default.

Loading

0 comments on commit 1ad2d83

Please sign in to comment.