Skip to content

Commit 17efda7

Browse files
robszewczykrobszewczyk
authored
Merge branch 'master' into feature/energypreferences
2 parents 48ed0f5 + a71f814 commit 17efda7

File tree

616 files changed

+20021
-7707
lines changed

Some content is hidden

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

616 files changed

+20021
-7707
lines changed

‎.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: ghcr.io/project-chip/chip-build-k32w:32
40+
image: ghcr.io/project-chip/chip-build-k32w:33
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-tv-app.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Copyright (c) 2023 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Build example - TV App and TV Casting App
16+
17+
on:
18+
push:
19+
pull_request:
20+
merge_group:
21+
22+
concurrency:
23+
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
24+
cancel-in-progress: true
25+
26+
env:
27+
CHIP_NO_LOG_TIMESTAMPS: true
28+
29+
jobs:
30+
tv-app:
31+
name: TV App
32+
33+
env:
34+
BUILD_TYPE: tv_app
35+
36+
runs-on: ubuntu-latest
37+
if: github.actor != 'restyled-io[bot]'
38+
39+
container:
40+
image: ghcr.io/project-chip/chip-build-android:35
41+
volumes:
42+
- "/tmp/bloat_reports:/tmp/bloat_reports"
43+
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v4
47+
- name: Checkout submodules & Bootstrap
48+
uses: ./.github/actions/checkout-submodules-and-bootstrap
49+
with:
50+
platform: android
51+
- name: Set up environment for size reports
52+
uses: ./.github/actions/setup-size-reports
53+
if: ${{ !env.ACT }}
54+
with:
55+
gh-context: ${{ toJson(github) }}
56+
- name: Build Android arm64-tv-casting-app
57+
run: |
58+
./scripts/run_in_build_env.sh \
59+
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
60+
- name: Clean out build output
61+
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
62+
- name: Build Android arm64-tv-server
63+
run: |
64+
./scripts/run_in_build_env.sh \
65+
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
66+
- name: Clean out build output
67+
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
68+
- name: Uploading Size Reports
69+
uses: ./.github/actions/upload-size-reports
70+
if: ${{ !env.ACT }}
71+
with:
72+
platform-name: TVApp

‎.github/workflows/lint.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ jobs:
119119
--known-failure app/reporting/tests/MockReportScheduler.h \
120120
--known-failure app/server/AppDelegate.h \
121121
--known-failure app/TestEventTriggerDelegate.h \
122-
--known-failure app/util/af-enums.h \
123122
--known-failure app/util/af.h \
124123
--known-failure app/util/af-types.h \
125124
--known-failure app/util/attribute-metadata.h \
@@ -197,23 +196,23 @@ jobs:
197196
- name: Check for incorrect error use in VerifyOrExit
198197
if: always()
199198
run: |
200-
git grep -n "VerifyOrExit(.*, [A-Za-z]*_ERROR" -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
199+
git grep -I -n "VerifyOrExit(.*, [A-Za-z]*_ERROR" -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
201200
202201
# git grep exits with 0 if it finds a match, but we want
203202
# to fail (exit nonzero) on match. And we want to exclude this file,
204203
# to avoid our grep regexp matching itself.
205204
- name: Check for use of PRI*8, which are not supported on some libcs.
206205
if: always()
207206
run: |
208-
git grep -n "PRI.8" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
207+
git grep -I -n "PRI.8" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
209208
210209
# git grep exits with 0 if it finds a match, but we want
211210
# to fail (exit nonzero) on match. And we want to exclude this file,
212211
# to avoid our grep regexp matching itself.
213212
- name: Check for use of PRI*16, which are not supported on some libcs.
214213
if: always()
215214
run: |
216-
git grep -n "PRI.16" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
215+
git grep -I -n "PRI.16" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
217216
218217
# git grep exits with 0 if it finds a match, but we want
219218
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -226,7 +225,7 @@ jobs:
226225
# TODO: TLVDebug should ideally not be excluded here.
227226
# TODO: protocol_decoder.cpp should ideally not be excluded here.
228227
# TODO: PersistentStorageMacros.h should ideally not be excluded here.
229-
git grep -n "PRI.64" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)examples/chip-tool' ':(exclude)examples/tv-casting-app' ':(exclude)src/app/MessageDef/MessageDefHelper.cpp' ':(exclude)src/app/tests/integration/chip_im_initiator.cpp' ':(exclude)src/lib/core/TLVDebug.cpp' ':(exclude)src/lib/dnssd/tests/TestTxtFields.cpp' ':(exclude)src/lib/format/protocol_decoder.cpp' ':(exclude)src/lib/support/PersistentStorageMacros.h' ':(exclude)src/messaging/tests/echo/echo_requester.cpp' ':(exclude)src/platform/Linux' ':(exclude)src/platform/Ameba' ':(exclude)src/platform/ESP32' ':(exclude)src/platform/webos' ':(exclude)zzz_generated/chip-tool' ':(exclude)src/tools/chip-cert/Cmd_PrintCert.cpp' && exit 1 || exit 0
228+
git grep -I -n "PRI.64" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)examples/chip-tool' ':(exclude)examples/tv-casting-app' ':(exclude)src/app/MessageDef/MessageDefHelper.cpp' ':(exclude)src/app/tests/integration/chip_im_initiator.cpp' ':(exclude)src/lib/core/TLVDebug.cpp' ':(exclude)src/lib/dnssd/tests/TestTxtFields.cpp' ':(exclude)src/lib/format/protocol_decoder.cpp' ':(exclude)src/lib/support/PersistentStorageMacros.h' ':(exclude)src/messaging/tests/echo/echo_requester.cpp' ':(exclude)src/platform/Linux' ':(exclude)src/platform/Ameba' ':(exclude)src/platform/ESP32' ':(exclude)src/platform/webos' ':(exclude)zzz_generated/chip-tool' ':(exclude)src/tools/chip-cert/Cmd_PrintCert.cpp' && exit 1 || exit 0
230229
231230
# git grep exits with 0 if it finds a match, but we want
232231
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -261,15 +260,15 @@ jobs:
261260
- name: Check for use of 0x%u and the like, which lead to misleading output.
262261
if: always()
263262
run: |
264-
git grep -n '0x%[0-9l.-]*[^0-9lxX".-]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
263+
git grep -I -n '0x%[0-9l.-]*[^0-9lxX".-]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
265264
266265
# git grep exits with 0 if it finds a match, but we want
267266
# to fail (exit nonzero) on match. And we want to exclude this file,
268267
# to avoid our grep regexp matching itself.
269268
- name: Check for use of '"0x" PRIu*' and the like, which lead to misleading output.
270269
if: always()
271270
run: |
272-
git grep -n '0x%[0-9-]*" *PRI[^xX]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
271+
git grep -I -n '0x%[0-9-]*" *PRI[^xX]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
273272
274273
# git grep exits with 0 if it finds a match, but we want
275274
# to fail (exit nonzero) on match.
@@ -285,7 +284,7 @@ jobs:
285284
- name: Check for use of 'emberAfReadAttribute' instead of the type-safe getters
286285
if: always()
287286
run: |
288-
git grep -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' && exit 1 || exit 0
287+
git grep -I -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' && exit 1 || exit 0
289288
290289
# git grep exits with 0 if it finds a match, but we want
291290
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -295,7 +294,7 @@ jobs:
295294
- name: Check for use of 'emberAfWriteAttribute' instead of the type-safe setters
296295
if: always()
297296
run: |
298-
git grep -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' ':(exclude)examples/common/pigweed/rpc_services/Attributes.h' ':(exclude)src/app/util/attribute-table.h' ':(exclude)src/app/util/ember-compatibility-functions.cpp' && exit 1 || exit 0
297+
git grep -I -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' ':(exclude)examples/common/pigweed/rpc_services/Attributes.h' ':(exclude)src/app/util/attribute-table.h' ':(exclude)src/app/util/ember-compatibility-functions.cpp' && exit 1 || exit 0
299298
300299
# Run python Linter (flake8) and verify python files
301300
# ignore some style errors, restyler should do that
@@ -310,12 +309,12 @@ jobs:
310309
- name: Check for use of "SuccessOrExit(CHIP_ERROR_*)", which should probably be "SuccessOrExit(err = CHIP_ERROR_*)"
311310
if: always()
312311
run: |
313-
git grep -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
312+
git grep -I -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
314313
315314
# git grep exits with 0 if it finds a match, but we want
316315
# to fail (exit nonzero) on match. And we want to exclude this file,
317316
# to avoid our grep regexp matching itself.
318317
- name: Check for use of "SuccessOrExit(something-without-assignment(", which should probably be "SuccessOrExit(err = something("
319318
if: always()
320319
run: |
321-
git grep -n 'SuccessOrExit([^=)]*(' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
320+
git grep -I -n 'SuccessOrExit([^=)]*(' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0

0 commit comments

Comments
 (0)