Skip to content

Commit

Permalink
Merge branch 'master' into create_CADMIN_1_3_test
Browse files Browse the repository at this point in the history
  • Loading branch information
j-ororke authored Sep 27, 2024
2 parents 28ba101 + 941c1d2 commit b2d9a67
Show file tree
Hide file tree
Showing 979 changed files with 111,899 additions and 171,648 deletions.
4 changes: 3 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Checks: >
-bugprone-multi-level-implicit-pointer-conversion,
-bugprone-narrowing-conversions,
-bugprone-not-null-terminated-result,
-bugprone-pointer-arithmetic-on-polymorphic-object,
-bugprone-reserved-identifier,
-bugprone-signed-char-misuse,
-bugprone-suspicious-include,
Expand All @@ -45,6 +46,7 @@ Checks: >
-clang-analyzer-security.insecureAPI.rand,
-clang-analyzer-security.insecureAPI.strcpy,
-clang-analyzer-unix.Malloc,
-clang-diagnostic-implicit-int-conversion
-clang-diagnostic-implicit-int-conversion,
-clang-diagnostic-missing-template-arg-list-after-template-kw
WarningsAsErrors: '*'
HeaderFilterRegex: '(src|examples|zzz_generated|credentials).*(?<!third_party.*repo)'
5 changes: 5 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ dpkg
dropdown
dryrun
DS
DSLS
duplicative
DUT
DUTS
Expand All @@ -461,6 +462,7 @@ DV
DVK
dynload
eabi
EAF
EB
ECC
ECD
Expand Down Expand Up @@ -551,6 +553,7 @@ feff
ffaa
ffeebaefa
FFF
FFFFFFFFFFFF0102
fffe
fffff
Fi
Expand Down Expand Up @@ -1626,3 +1629,5 @@ zhengyaohan
Zigbee
zigbeealliance
zigbeethread
zsdk
TBR
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:74
image: ghcr.io/project-chip/chip-build:80

steps:
- name: Checkout
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:74
image: ghcr.io/project-chip/chip-build:80
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:74
image: ghcr.io/project-chip/chip-build:80
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -283,7 +283,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:80
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -316,9 +316,10 @@ jobs:
run: |
scripts/run_in_build_env.sh 'virtualenv pyenv'
source pyenv/bin/activate
pip3 install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl
pip3 install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl
pip3 install ./out/controller/python/chip_repl-0.0-py3-none-any.whl
python -m ensurepip --upgrade
python -m pip install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl
python -m pip install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl
python -m pip install ./out/controller/python/chip_repl-0.0-py3-none-any.whl
- name: Run Python tests
shell: bash
Expand All @@ -334,7 +335,8 @@ jobs:
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
scripts/run_in_build_env.sh 'virtualenv pyenv'
source pyenv/bin/activate
pip3 install -r scripts/setup/requirements.setuppayload.txt
python -m ensurepip --upgrade
python -m pip install -r scripts/setup/requirements.setuppayload.txt
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
build_linux_python_lighting_device:
Expand All @@ -344,7 +346,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:80
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -455,7 +457,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:74
image: ghcr.io/project-chip/chip-build:80
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ concurrency:

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
chef_linux:
name: Chef - Linux CI Examples
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:74
image: ghcr.io/project-chip/chip-build:80
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-esp32:74
image: ghcr.io/project-chip/chip-build-esp32:80
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:74
image: ghcr.io/project-chip/chip-build-nrf-platform:80
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-telink:74
image: ghcr.io/project-chip/chip-build-telink:80
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ghcr.io/project-chip/chip-build-doxygen:74
image: ghcr.io/project-chip/chip-build-doxygen:80

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example-tv-casting-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
tv-casting-bridge:
name: Build TV Casting Bridge example
if: github.actor != 'restyled-io[bot]'
runs-on: macos-13
runs-on: macos-14
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
ameba:
name: Ameba
Expand All @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ameba:74
image: ghcr.io/project-chip/chip-build-ameba:80
options: --user root

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-asr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
asr:
name: ASR
Expand All @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-asr:74
image: ghcr.io/project-chip/chip-build-asr:80
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-bouffalolab:74
image: ghcr.io/project-chip/chip-build-bouffalolab:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
26 changes: 6 additions & 20 deletions .github/workflows/examples-cc13xx_26xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,11 @@
name: Build example - TI CC13XX_26XX

on:
workflow_dispatch:
# Temporarely disabled:
# - TI CI runs out of disk space
# - Image should be updated to an Ubuntu 24.04 or higher based one (move from :54 version)
# push:
# branches-ignore:
# - 'dependabot/**'
# pull_request:
# merge_group:
push:
branches-ignore:
- "dependabot/**"
pull_request:
merge_group:

concurrency:
group:
Expand All @@ -45,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:74
image: ghcr.io/project-chip/chip-build-ti:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand All @@ -67,13 +63,9 @@ jobs:
scripts/run_in_build_env.sh "\
./scripts/build/build_examples.py \
--target ti-cc13x4_26x4-lighting-ftd \
--target ti-cc13x4_26x4-lighting-mtd \
--target ti-cc13x4_26x4-lock-ftd \
--target ti-cc13x4_26x4-lock-mtd \
--target ti-cc13x4_26x4-pump-mtd \
--target ti-cc13x4_26x4-pump-ftd \
--target ti-cc13x4_26x4-pump-controller-mtd \
--target ti-cc13x4_26x4-pump-controller-ftd \
build \
--copy-artifacts-to out/artifacts \
"
Expand All @@ -83,12 +75,6 @@ jobs:
cc13x4_26x4 LP_EM_CC1354P10_6 lock-ftd \
out/artifacts/ti-cc13x4_26x4-lock-ftd/chip-LP_EM_CC1354P10_6-lock-example.out \
/tmp/bloat_reports/
- name: Get lock MTD size stats
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
cc13x4_26x4 LP_EM_CC1354P10_6 lock-mtd \
out/artifacts/ti-cc13x4_26x4-lock-mtd/chip-LP_EM_CC1354P10_6-lock-example.out \
/tmp/bloat_reports/
- name: Get Pump App size stats
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/examples-cc32xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,19 @@ name: Build example - TI CC32XX

on:
workflow_dispatch:
# Temporarely disabled:
# - TI CI runs out of disk space
# - Image should be updated to an Ubuntu 24.04 or higher based one (move from :54 version)
# push:
# branches-ignore:
# - 'dependabot/**'
# pull_request:
# merge_group:
push:
branches-ignore:
- "dependabot/**"
pull_request:
merge_group:

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

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
cc32xx:
name: cc32xx
Expand All @@ -43,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:74
image: ghcr.io/project-chip/chip-build-ti:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:74
image: ghcr.io/project-chip/chip-build-efr32:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down Expand Up @@ -128,6 +128,24 @@ jobs:
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build BRD2605A WiFi Soc variants
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--enable-flashbundle \
--target efr32-brd2605a-light-skip-rps-generation \
--target efr32-brd2605a-lock-skip-rps-generation \
build \
--copy-artifacts-to out/artifacts \
"
- name: Prepare bloat report for brd2605a lock app
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
efr32 BRD2605a lock-app \
out/efr32-brd2605a-lock-skip-rps-generation/matter-silabs-lock-example.out \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
- name: Build EFR32 with WiFi NCP
run: |
./scripts/run_in_build_env.sh \
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
esp32:
name: ESP32
Expand All @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:74
image: ghcr.io/project-chip/chip-build-esp32:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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

container:
image: ghcr.io/project-chip/chip-build-esp32:74
image: ghcr.io/project-chip/chip-build-esp32:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
Loading

0 comments on commit b2d9a67

Please sign in to comment.