Skip to content

Commit 5529d74

Browse files
arkqarkq
authored
Set auto_envvar_prefix for click apps to CHIP (project-chip#23797)
This change will allow setting default values for e.g. build_examples.py script with environment variables. Simple use case might be to enable ccache for all targets and disable timestamp logs with: export CHIP_NO_LOG_TIMESTAMPS=true export CHIP_PW_COMMAND_LAUNCHER=ccache
1 parent cee7764 commit 5529d74

35 files changed

+209
-102
lines changed

‎.github/workflows/build.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ concurrency:
2323
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2424
cancel-in-progress: true
2525

26+
env:
27+
CHIP_NO_LOG_TIMESTAMPS: true
28+
2629
jobs:
30+
2731
build_linux_gcc_debug:
2832
name: Build on Linux (gcc_debug)
2933
timeout-minutes: 85
@@ -125,6 +129,7 @@ jobs:
125129
# path: out/
126130
# # objdirs are big; don't hold on to them too long.
127131
# retention-days: 5
132+
128133
build_linux:
129134
name: Build on Linux (fake, gcc_release, clang, simulated)
130135
timeout-minutes: 150
@@ -219,7 +224,6 @@ jobs:
219224
run: |
220225
./scripts/run_in_build_env.sh \
221226
"./scripts/run-clang-tidy-on-compile-commands.py \
222-
--no-log-timestamps \
223227
--compile-database out/sanitizers/compile_commands.json \
224228
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/' \
225229
check \
@@ -228,7 +232,7 @@ jobs:
228232
timeout-minutes: 60
229233
run: |
230234
./scripts/run_in_build_env.sh \
231-
"./scripts/build/build_examples.py --no-log-timestamps \
235+
"./scripts/build/build_examples.py \
232236
--target linux-x64-minmdns-ipv6only-clang \
233237
--target linux-x64-rpc-console \
234238
build \
@@ -241,7 +245,7 @@ jobs:
241245
timeout-minutes: 60
242246
run: |
243247
./scripts/run_in_build_env.sh \
244-
"./scripts/build/build_examples.py --no-log-timestamps \
248+
"./scripts/build/build_examples.py \
245249
--target linux-x64-all-clusters-ipv6only-clang \
246250
--target linux-x64-chip-tool-ipv6only-clang \
247251
--pregen-dir ./zzz_pregenerated \
@@ -255,7 +259,7 @@ jobs:
255259
timeout-minutes: 15
256260
run: |
257261
./scripts/run_in_build_env.sh \
258-
"./scripts/build/build_examples.py --no-log-timestamps --target linux-fake-tests build"
262+
"./scripts/build/build_examples.py --target linux-fake-tests build"
259263
- name: Uploading core files
260264
uses: actions/upload-artifact@v3
261265
if: ${{ failure() && !env.ACT }}
@@ -295,6 +299,7 @@ jobs:
295299
# - name: Perform CodeQL Analysis
296300
# if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
297301
# uses: github/codeql-action/analyze@v1
302+
298303
build_linux_python_lib:
299304
name: Build on Linux (python_lib)
300305
timeout-minutes: 60
@@ -430,7 +435,6 @@ jobs:
430435
run: |
431436
./scripts/run_in_build_env.sh \
432437
"./scripts/run-clang-tidy-on-compile-commands.py \
433-
--no-log-timestamps \
434438
--compile-database out/default/compile_commands.json \
435439
check \
436440
"

‎.github/workflows/darwin-tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ concurrency:
2525
'workflow_dispatch' && github.run_number) || github.sha }}
2626
cancel-in-progress: true
2727

28+
env:
29+
CHIP_NO_LOG_TIMESTAMPS: true
30+
2831
jobs:
2932
test_suites_chip_tool_darwin:
3033
name: Test Suites - Darwin

‎.github/workflows/examples-ameba.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
ameba:
2730
name: Ameba

‎.github/workflows/examples-bouffalolab.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
bl602:
2730
name: BL602

‎.github/workflows/examples-cc13x2x7_26x2x7.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
cc26x2x7:
2730
name: cc26x2x7

‎.github/workflows/examples-efr32.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
efr32:
2730
name: EFR32

‎.github/workflows/examples-esp32.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
esp32:
2730
name: ESP32

‎.github/workflows/examples-infineon.yaml

+7-4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ concurrency:
2323
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2424
cancel-in-progress: true
2525

26+
env:
27+
CHIP_NO_LOG_TIMESTAMPS: true
28+
2629
jobs:
2730
infineon:
2831
name: Infineon examples building
@@ -69,7 +72,7 @@ jobs:
6972
run: |
7073
scripts/run_in_build_env.sh \
7174
"scripts/build/build_examples.py \
72-
--enable-flashbundle --no-log-timestamps \
75+
--enable-flashbundle \
7376
--target infineon-psoc6-lock \
7477
build \
7578
--copy-artifacts-to out/artifacts \
@@ -83,7 +86,7 @@ jobs:
8386
run: |
8487
scripts/run_in_build_env.sh \
8588
"scripts/build/build_examples.py \
86-
--enable-flashbundle --no-log-timestamps \
89+
--enable-flashbundle \
8790
--target infineon-psoc6-all-clusters \
8891
build \
8992
--copy-artifacts-to out/artifacts \
@@ -97,7 +100,7 @@ jobs:
97100
run: |
98101
scripts/run_in_build_env.sh \
99102
"scripts/build/build_examples.py \
100-
--enable-flashbundle --no-log-timestamps \
103+
--enable-flashbundle \
101104
--target infineon-psoc6-all-clusters-minimal \
102105
build \
103106
--copy-artifacts-to out/artifacts \
@@ -111,7 +114,7 @@ jobs:
111114
run: |
112115
scripts/run_in_build_env.sh \
113116
"scripts/build/build_examples.py \
114-
--enable-flashbundle --no-log-timestamps \
117+
--enable-flashbundle \
115118
--target infineon-psoc6-light \
116119
build \
117120
--copy-artifacts-to out/artifacts \

‎.github/workflows/examples-k32w.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
k32w:
2730
name: K32W

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

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
arm_crosscompile:
2730
name: Linux ARM Cross compile
@@ -64,11 +67,13 @@ jobs:
6467
path: |
6568
.environment/gn_out/.ninja_log
6669
.environment/pigweed-venv/*.log
70+
6771
- name: Build Some samples
6872
timeout-minutes: 45
6973
run: |
7074
./scripts/run_in_build_env.sh \
7175
"./scripts/build/build_examples.py \
76+
--target linux-arm64-chip-cert \
7277
--target linux-arm64-all-clusters-clang \
7378
--target linux-arm64-chip-tool-ipv6only-clang \
7479
--target linux-arm64-lock-clang \

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

+23-13
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ concurrency:
2222
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
2323
cancel-in-progress: true
2424

25+
env:
26+
CHIP_NO_LOG_TIMESTAMPS: true
27+
2528
jobs:
2629
imx:
2730
name: Linux i.MX Build
@@ -45,53 +48,60 @@ jobs:
4548
- name: Checkout submodules
4649
run: scripts/checkout_submodules.py --shallow --platform linux
4750

48-
- name: Build App
51+
- name: Bootstrap
52+
run: scripts/build/gn_bootstrap.sh
53+
54+
- name: Build lighting-app
4955
timeout-minutes: 30
5056
run: |
51-
./scripts/examples/imxlinux_example.sh \
52-
examples/lighting-app/linux/ examples/lighting-app/linux/out/aarch64
57+
./scripts/run_in_build_env.sh \
58+
"./scripts/build/build_examples.py \
59+
--target imx-lighting-app \
60+
build"
5361
- name: Clean out build output
5462
run: rm -rf ./out
5563
- name: Build chip-tool
5664
timeout-minutes: 30
5765
run: |
58-
./scripts/examples/imxlinux_example.sh \
59-
examples/chip-tool examples/chip-tool/out/aarch64
66+
./scripts/run_in_build_env.sh \
67+
"./scripts/build/build_examples.py \
68+
--target imx-chip-tool \
69+
build"
6070
- name: Clean out build output
6171
run: rm -rf ./out
6272
- name: Build thermostat
6373
timeout-minutes: 30
6474
run: |
6575
./scripts/run_in_build_env.sh \
6676
"./scripts/build/build_examples.py \
67-
--target imx-thermostat build \
68-
"
77+
--target imx-thermostat \
78+
build"
6979
- name: Clean out build output
7080
run: rm -rf ./out
7181
- name: Build all-cluster
7282
timeout-minutes: 30
7383
run: |
7484
./scripts/run_in_build_env.sh \
7585
"./scripts/build/build_examples.py \
76-
--target imx-all-clusters-app build \
77-
"
86+
--target imx-all-clusters-app \
87+
build"
7888
- name: Clean out build output
7989
run: rm -rf ./out
8090
- name: Build all-cluster-minimal
8191
timeout-minutes: 30
8292
run: |
8393
./scripts/run_in_build_env.sh \
8494
"./scripts/build/build_examples.py \
85-
--target imx-all-clusters-minimal-app build \
86-
"
95+
--target imx-all-clusters-minimal-app \
96+
build"
8797
- name: Clean out build output
8898
run: rm -rf ./out
8999
- name: Build ota-provider-app
90100
timeout-minutes: 30
91101
run: |
92102
./scripts/run_in_build_env.sh \
93103
"./scripts/build/build_examples.py \
94-
--target imx-ota-provider-app build
95-
"
104+
--target imx-ota-provider-app \
105+
build"
96106
- name: Clean out build output
97107
run: rm -rf ./out

0 commit comments

Comments
 (0)