Skip to content

Commit 0d82c3a

Browse files
hastyhasty
authored
Merge branch 'master' into granbery/thermostat_presets_minmax_fix
2 parents 527c219 + e527611 commit 0d82c3a

File tree

607 files changed

+39130
-88109
lines changed

Some content is hidden

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

607 files changed

+39130
-88109
lines changed

‎.clang-tidy

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Checks: >
2424
-bugprone-multi-level-implicit-pointer-conversion,
2525
-bugprone-narrowing-conversions,
2626
-bugprone-not-null-terminated-result,
27+
-bugprone-pointer-arithmetic-on-polymorphic-object,
2728
-bugprone-reserved-identifier,
2829
-bugprone-signed-char-misuse,
2930
-bugprone-suspicious-include,
@@ -45,6 +46,7 @@ Checks: >
4546
-clang-analyzer-security.insecureAPI.rand,
4647
-clang-analyzer-security.insecureAPI.strcpy,
4748
-clang-analyzer-unix.Malloc,
48-
-clang-diagnostic-implicit-int-conversion
49+
-clang-diagnostic-implicit-int-conversion,
50+
-clang-diagnostic-missing-template-arg-list-after-template-kw
4951
WarningsAsErrors: '*'
5052
HeaderFilterRegex: '(src|examples|zzz_generated|credentials).*(?<!third_party.*repo)'

‎.github/.wordlist.txt

+5
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ dpkg
453453
dropdown
454454
dryrun
455455
DS
456+
DSLS
456457
duplicative
457458
DUT
458459
DUTS
@@ -461,6 +462,7 @@ DV
461462
DVK
462463
dynload
463464
eabi
465+
EAF
464466
EB
465467
ECC
466468
ECD
@@ -551,6 +553,7 @@ feff
551553
ffaa
552554
ffeebaefa
553555
FFF
556+
FFFFFFFFFFFF0102
554557
fffe
555558
fffff
556559
Fi
@@ -1626,3 +1629,5 @@ zhengyaohan
16261629
Zigbee
16271630
zigbeealliance
16281631
zigbeethread
1632+
zsdk
1633+
TBR

‎.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:76
37+
image: ghcr.io/project-chip/chip-build:77
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:76
45+
image: ghcr.io/project-chip/chip-build:77
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -138,7 +138,7 @@ jobs:
138138
if: github.actor != 'restyled-io[bot]'
139139

140140
container:
141-
image: ghcr.io/project-chip/chip-build:76
141+
image: ghcr.io/project-chip/chip-build:77
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -283,7 +283,7 @@ jobs:
283283
if: github.actor != 'restyled-io[bot]'
284284

285285
container:
286-
image: ghcr.io/project-chip/chip-build:76
286+
image: ghcr.io/project-chip/chip-build:77
287287
volumes:
288288
- "/:/runner-root-volume"
289289
- "/tmp/log_output:/tmp/test_logs"
@@ -346,7 +346,7 @@ jobs:
346346
if: github.actor != 'restyled-io[bot]'
347347

348348
container:
349-
image: ghcr.io/project-chip/chip-build:76
349+
image: ghcr.io/project-chip/chip-build:77
350350
volumes:
351351
- "/:/runner-root-volume"
352352
- "/tmp/log_output:/tmp/test_logs"
@@ -457,7 +457,7 @@ jobs:
457457
if: github.actor != 'restyled-io[bot]'
458458

459459
container:
460-
image: ghcr.io/project-chip/chip-build:76
460+
image: ghcr.io/project-chip/chip-build:77
461461
volumes:
462462
- "/:/runner-root-volume"
463463
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
chef_linux:
3333
name: Chef - Linux CI Examples
3434
runs-on: ubuntu-latest
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:76
38+
image: ghcr.io/project-chip/chip-build:77
3939
options: --user root
4040

4141
steps:
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:76
59+
image: ghcr.io/project-chip/chip-build-esp32:77
6060
options: --user root
6161

6262
steps:
@@ -77,7 +77,7 @@ jobs:
7777
if: github.actor != 'restyled-io[bot]'
7878

7979
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:76
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:77
8181
options: --user root
8282

8383
steps:
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:76
101+
image: ghcr.io/project-chip/chip-build-telink:77
102102
options: --user root
103103

104104
steps:

‎.github/workflows/darwin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
framework:
3737
name: Build framework
3838
if: github.actor != 'restyled-io[bot]'
39-
runs-on: macos-13
39+
runs-on: macos-14
4040
strategy:
4141
matrix:
4242
options: # We don't need a full matrix
@@ -73,7 +73,7 @@ jobs:
7373
name: Run framework tests
7474
if: github.actor != 'restyled-io[bot]'
7575
needs: [framework] # serialize to avoid running to many parallel macos runners
76-
runs-on: macos-13
76+
runs-on: macos-14
7777
strategy:
7878
matrix:
7979
options: # We don't need a full matrix

‎.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:76
84+
image: ghcr.io/project-chip/chip-build-doxygen:77
8585

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

‎.github/workflows/example-tv-casting-darwin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
tv-casting-bridge:
3737
name: Build TV Casting Bridge example
3838
if: github.actor != 'restyled-io[bot]'
39-
runs-on: macos-13
39+
runs-on: macos-14
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v4

‎.github/workflows/examples-ameba.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
ameba:
3333
name: Ameba
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-ameba:76
41+
image: ghcr.io/project-chip/chip-build-ameba:77
4242
options: --user root
4343

4444
steps:

‎.github/workflows/examples-asr.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
asr:
3333
name: ASR
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-asr:76
39+
image: ghcr.io/project-chip/chip-build-asr:77
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-bouffalolab.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-bouffalolab:76
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:77
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

+6-20
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@
1515
name: Build example - TI CC13XX_26XX
1616

1717
on:
18-
workflow_dispatch:
19-
# Temporarely disabled:
20-
# - TI CI runs out of disk space
21-
# - Image should be updated to an Ubuntu 24.04 or higher based one (move from :54 version)
22-
# push:
23-
# branches-ignore:
24-
# - 'dependabot/**'
25-
# pull_request:
26-
# merge_group:
18+
push:
19+
branches-ignore:
20+
- "dependabot/**"
21+
pull_request:
22+
merge_group:
2723

2824
concurrency:
2925
group:
@@ -45,7 +41,7 @@ jobs:
4541
if: github.actor != 'restyled-io[bot]'
4642

4743
container:
48-
image: ghcr.io/project-chip/chip-build-ti:76
44+
image: ghcr.io/project-chip/chip-build-ti:77
4945
volumes:
5046
- "/tmp/bloat_reports:/tmp/bloat_reports"
5147
steps:
@@ -67,13 +63,9 @@ jobs:
6763
scripts/run_in_build_env.sh "\
6864
./scripts/build/build_examples.py \
6965
--target ti-cc13x4_26x4-lighting-ftd \
70-
--target ti-cc13x4_26x4-lighting-mtd \
7166
--target ti-cc13x4_26x4-lock-ftd \
72-
--target ti-cc13x4_26x4-lock-mtd \
7367
--target ti-cc13x4_26x4-pump-mtd \
74-
--target ti-cc13x4_26x4-pump-ftd \
7568
--target ti-cc13x4_26x4-pump-controller-mtd \
76-
--target ti-cc13x4_26x4-pump-controller-ftd \
7769
build \
7870
--copy-artifacts-to out/artifacts \
7971
"
@@ -83,12 +75,6 @@ jobs:
8375
cc13x4_26x4 LP_EM_CC1354P10_6 lock-ftd \
8476
out/artifacts/ti-cc13x4_26x4-lock-ftd/chip-LP_EM_CC1354P10_6-lock-example.out \
8577
/tmp/bloat_reports/
86-
- name: Get lock MTD size stats
87-
run: |
88-
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
89-
cc13x4_26x4 LP_EM_CC1354P10_6 lock-mtd \
90-
out/artifacts/ti-cc13x4_26x4-lock-mtd/chip-LP_EM_CC1354P10_6-lock-example.out \
91-
/tmp/bloat_reports/
9278
- name: Get Pump App size stats
9379
run: |
9480
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \

‎.github/workflows/examples-cc32xx.yaml

+7-10
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@ name: Build example - TI CC32XX
1616

1717
on:
1818
workflow_dispatch:
19-
# Temporarely disabled:
20-
# - TI CI runs out of disk space
21-
# - Image should be updated to an Ubuntu 24.04 or higher based one (move from :54 version)
22-
# push:
23-
# branches-ignore:
24-
# - 'dependabot/**'
25-
# pull_request:
26-
# merge_group:
19+
push:
20+
branches-ignore:
21+
- "dependabot/**"
22+
pull_request:
23+
merge_group:
2724

2825
concurrency:
2926
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
3027
cancel-in-progress: true
3128

3229
env:
3330
CHIP_NO_LOG_TIMESTAMPS: true
34-
31+
3532
jobs:
3633
cc32xx:
3734
name: cc32xx
@@ -43,7 +40,7 @@ jobs:
4340
if: github.actor != 'restyled-io[bot]'
4441

4542
container:
46-
image: ghcr.io/project-chip/chip-build-ti:76
43+
image: ghcr.io/project-chip/chip-build-ti:77
4744
volumes:
4845
- "/tmp/bloat_reports:/tmp/bloat_reports"
4946
steps:

‎.github/workflows/examples-efr32.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: ghcr.io/project-chip/chip-build-efr32:76
43+
image: ghcr.io/project-chip/chip-build-efr32:78
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-esp32.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232
esp32:
3333
name: ESP32
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-esp32:76
39+
image: ghcr.io/project-chip/chip-build-esp32:77
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -91,7 +91,7 @@ jobs:
9191
run: |
9292
rm -rf ./zzz_pregenerated
9393
mv scripts/codegen.py.renamed scripts/codegen.py
94-
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
94+
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
9595
- name: Build example All Clusters App(Target:ESP32C3)
9696
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
9797
- name: Copy aside build products
@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:76
129+
image: ghcr.io/project-chip/chip-build-esp32:77
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-infineon.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828

2929
env:
3030
CHIP_NO_LOG_TIMESTAMPS: true
31-
31+
3232
jobs:
3333
infineon:
3434
name: Infineon examples building
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-infineon:76
40+
image: ghcr.io/project-chip/chip-build-infineon:77
4141
env:
4242
# TODO: this should probably be part of the dockerfile itself
4343
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

0 commit comments

Comments
 (0)