Skip to content

Commit

Permalink
Merge branch 'master' into DFT_AddMemoryDumpGraphCommand
Browse files Browse the repository at this point in the history
  • Loading branch information
vivien-apple authored Oct 11, 2024
2 parents e8cc757 + 907caa6 commit 19fb18f
Show file tree
Hide file tree
Showing 102 changed files with 21,413 additions and 583 deletions.
1 change: 1 addition & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ OpenThreadDemo
openweave
OperationalCredentials
operationalDataset
operationalstate
opkg
OPTIGA
optionMask
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ jobs:
env:
BUILD_TYPE: default
run: |
# We want to build various standalone example apps similar to what examples-linux-standalone.yaml
# We want to build various standalone example apps (similar to what examples-linux-standalone.yaml
# does), so use target_os="all" to get those picked up as part of the "unified" build. But then
# to save CI resources we want to exclude the "host clang" build, which uses the pigweed clang.
scripts/build/gn_gen.sh --args='target_os="all" is_asan=true enable_host_clang_build=false chip_data_model_check_die_on_failure=true' --export-compile-commands
Expand Down
33 changes: 15 additions & 18 deletions .github/workflows/cancel_workflows_for_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: Cancel workflow on PR
name: Cancel workflows on failing CI
on:
workflow_dispatch:
inputs:
pull_request_id:
description: 'PR number to consider'
required: true
type: number
commit_sha:
description: 'Cancel runs for this specific SHA'
required: true
type: string
schedule:
- cron: "*/10 * * * *"

jobs:
cancel_workflow:
name: Report on pull requests
name: Cancel CI on failing pull requests

runs-on: ubuntu-latest

Expand All @@ -42,14 +35,18 @@ jobs:
python-version: '3.12'
- name: Setup pip modules we use
run: |
pip install \
click \
coloredlogs \
pygithub \
pip install \
click \
coloredlogs \
python-dateutil \
pygithub \
&& echo "DONE installint python prerequisites"
- name: Cancel runs
run: |
scripts/tools/cancel_workflows_for_pr.py \
--pull-request ${{ inputs.pull_request_id }} \
--commit-sha "${{ inputs.commit_sha }}" \
--gh-api-token "${{ secrets.GITHUB_TOKEN }}"
--gh-api-token "${{ secrets.GITHUB_TOKEN }}" \
--require "Restyled" \
--require "Lint Code Base" \
--require "ZAP" \
--require "Run misspell" \
--max-pr-age-minutes 20
49 changes: 12 additions & 37 deletions .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,15 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target bouffalolab-bl602dk-light-easyflash \
--target bouffalolab-bl602dk-light-mfd-littlefs \
--target bouffalolab-bl602dk-light-rpc-115200-littlefs \
--target bouffalolab-bl602dk-light-mfd-littlefs-rpc-115200 \
build \
--copy-artifacts-to out/artifacts \
"
- name: Prepare some bloat report from the previous builds
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl602 bl602 lighting-app \
out/artifacts/bouffalolab-bl602dk-light-easyflash/chip-bl602-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl602 bl602+mfd lighting-app \
out/artifacts/bouffalolab-bl602dk-light-mfd-littlefs/chip-bl602-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl602 bl602+rpc lighting-app \
out/artifacts/bouffalolab-bl602dk-light-rpc-115200-littlefs/chip-bl602-lighting-example.out \
bl602 bl602+mfd+littlefs+rpc lighting-app \
out/artifacts/bouffalolab-bl602dk-light-mfd-littlefs-rpc-115200/chip-bl602-lighting-example.out \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
Expand All @@ -85,35 +75,25 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target bouffalolab-bl706dk-light-easyflash \
--target bouffalolab-bl706dk-light-mfd-littlefs \
--target bouffalolab-bl706dk-light-ethernet-littlefs \
--target bouffalolab-bl706dk-light-ethernet-easyflash \
--target bouffalolab-bl706dk-light-wifi-littlefs \
--target bouffalolab-bl706dk-light-rpc-115200-littlefs \
--target bouffalolab-bl706dk-light-mfd-rpc-littlefs-115200 \
build \
--copy-artifacts-to out/artifacts \
"
- name: Prepare some bloat report from the previous builds
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702 bl702 lighting-app \
out/artifacts/bouffalolab-bl706dk-light-easyflash/chip-bl702-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702 bl702+mfd lighting-app \
out/artifacts/bouffalolab-bl706dk-light-mfd-littlefs/chip-bl702-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702 bl706-eth lighting-app \
out/artifacts/bouffalolab-bl706dk-light-ethernet-littlefs/chip-bl702-lighting-example.out \
bl702 bl702+eth lighting-app \
out/artifacts/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702 bl706-wifi lighting-app \
bl702 bl702+wifi lighting-app \
out/artifacts/bouffalolab-bl706dk-light-wifi-littlefs/chip-bl702-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702 bl702+rpc lighting-app \
out/artifacts/bouffalolab-bl706dk-light-rpc-115200-littlefs/chip-bl702-lighting-example.out \
bl702 bl706+mfd+rpc+littlefs lighting-app \
out/artifacts/bouffalolab-bl706dk-light-mfd-rpc-littlefs-115200/chip-bl702-lighting-example.out \
/tmp/bloat_reports/
- name: Clean out build output
run: rm -rf ./out
Expand All @@ -123,19 +103,14 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target bouffalolab-bl704ldk-light-easyflash \
--target bouffalolab-bl704ldk-light-mfd-littlefs \
build \
--copy-artifacts-to out/artifacts \
"
- name: Prepare some bloat report from the previous builds
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702l bl702l lighting-app \
out/artifacts/bouffalolab-bl704ldk-light-easyflash/chip-bl702l-lighting-example.out \
/tmp/bloat_reports/
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
bl702l bl702l+mfd lighting-app \
bl702l bl702l+mfd+littlefs lighting-app \
out/artifacts/bouffalolab-bl704ldk-light-mfd-littlefs/chip-bl702l-lighting-example.out \
/tmp/bloat_reports/
- name: Clean out build output
Expand All @@ -145,4 +120,4 @@ jobs:
uses: ./.github/actions/upload-size-reports
if: ${{ !env.ACT }}
with:
platform-name: BouffaloLab
platform-name: BouffaloLab
15 changes: 9 additions & 6 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,11 @@ jobs:
example_binaries/esp32-build/chip-all-clusters-app.elf \
/tmp/bloat_reports/
- name: Build example Pigweed App
run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults

- name: Build example Lighting App (Target:ESP32H2)
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2

- name: Build example Lock App (Target:ESP32C6)
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
- name: Build example Lighting App (Target:ESP32C6)
run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32c6 esp32c6

- name: Uploading Size Reports
uses: ./.github/actions/upload-size-reports
Expand All @@ -124,7 +121,7 @@ jobs:
name: ESP32_1

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'

container:
image: ghcr.io/project-chip/chip-build-esp32:81
Expand Down Expand Up @@ -168,3 +165,9 @@ jobs:

- name: Build example LIT ICD App (Target:ESP32H2)
run: scripts/examples/esp_example.sh lit-icd-app sdkconfig.defaults esp32h2

- name: Build example Pigweed App
run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults

- name: Build example Lock App (Target:ESP32C6)
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
2 changes: 1 addition & 1 deletion .github/workflows/qemu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
BUILD_TYPE: esp32-qemu

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'

container:
image: ghcr.io/project-chip/chip-build-esp32-qemu:81
Expand Down
8 changes: 8 additions & 0 deletions config/esp32/components/chip/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ dependencies:
- if: "idf_version >=5.0"
- if: "target != esp32h2"

# This matches the dependency of esp_insights
espressif/esp_diag_data_store:
version: "1.0.1"
require: public
rules:
- if: "idf_version >=5.0"
- if: "target != esp32h2"

espressif/esp_rcp_update:
version: "1.2.0"
rules:
Expand Down
Loading

0 comments on commit 19fb18f

Please sign in to comment.