From bbbddca024db422c19e56e7e6d753083801dc2d1 Mon Sep 17 00:00:00 2001 From: jepenven-silabs Date: Wed, 28 Sep 2022 08:12:28 -0400 Subject: [PATCH 1/3] Changes target board for silabs CI --- .github/workflows/examples-efr32.yaml | 12 ++++++------ scripts/build/build/targets.py | 1 + scripts/build/builders/efr32.py | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 897908b8bd7c8d..93906993921c4d 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -71,25 +71,25 @@ jobs: .environment/gn_out/.ninja_log .environment/pigweed-venv/*.log - - name: Build some BRD4161A variants + - name: Build some BRD4187C variants timeout-minutes: 50 run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ --enable-flashbundle \ - --target-glob '*-brd4161a-{lock,light,switch,window-covering,unit-test}' \ + --target-glob '*-brd4187c-{lock,light,switch,window-covering,unit-test}' \ 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 \ - efr32 BRD4161A lighting-app \ - out/efr32-brd4161a-light/chip-efr32-lighting-example.out \ + efr32 BRD4187C lighting-app \ + out/efr32-brd4187c-light/chip-efr32-lighting-example.out \ /tmp/bloat_reports/ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - efr32 BRD4161A window-app \ - out/efr32-brd4161a-window-covering/chip-efr32-window-example.out \ + efr32 BRD4187C window-app \ + out/efr32-brd4187c-window-covering/chip-efr32-window-example.out \ /tmp/bloat_reports/ - name: Build example EFR32 Lighting App for BRD4161A with RPCs timeout-minutes: 15 diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 999529ef5f5b4b..976fc80381c506 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -400,6 +400,7 @@ def Efr32Targets(): board_targets = [ efr_target.Extend('brd4161a', board=Efr32Board.BRD4161A), + efr_target.Extend('brd4187c', board=Efr32Board.BRD4187C), efr_target.Extend('brd4163a', board=Efr32Board.BRD4163A).GlobBlacklist( 'only user requested'), efr_target.Extend('brd4164a', board=Efr32Board.BRD4164A).GlobBlacklist( diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py index 34979314923751..6978366fed8fed 100644 --- a/scripts/build/builders/efr32.py +++ b/scripts/build/builders/efr32.py @@ -81,6 +81,7 @@ class Efr32Board(Enum): BRD4186A = 6 BRD4187A = 7 BRD4304A = 8 + BRD4187C = 9 def GnArgName(self): if self == Efr32Board.BRD4161A: @@ -99,6 +100,8 @@ def GnArgName(self): return 'BRD4187A' elif self == Efr32Board.BRD4304A: return 'BRD4304A' + elif self == Efr32Board.BRD4187C: + return 'BRD4187C' else: raise Exception('Unknown board #: %r' % self) From 881205748b913cbe44dd10e4f31bb311fcbcb475 Mon Sep 17 00:00:00 2001 From: jepenven-silabs Date: Thu, 29 Sep 2022 13:56:44 -0400 Subject: [PATCH 2/3] fix CI --- .../testdata/all_targets_except_host.txt | 14 ++++ .../build/testdata/build_all_except_host.txt | 84 +++++++++++++++++++ .../glob_star_targets_except_host.txt | 7 ++ 3 files changed, 105 insertions(+) diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt index c30e44fc41b5e6..247535b2ba885a 100644 --- a/scripts/build/testdata/all_targets_except_host.txt +++ b/scripts/build/testdata/all_targets_except_host.txt @@ -130,6 +130,20 @@ efr32-brd4187a-unit-test (NOGLOB: only user requested) efr32-brd4187a-unit-test-with-ota-requestor (NOGLOB: only user requested) efr32-brd4187a-window-covering (NOGLOB: only user requested) efr32-brd4187a-window-covering-with-ota-requestor (NOGLOB: only user requested) +efr32-brd4187c-light +efr32-brd4187c-light-rpc +efr32-brd4187c-light-rpc-with-ota-requestor (NOGLOB: Reduce default build variants) +efr32-brd4187c-light-with-ota-requestor (NOGLOB: Reduce default build variants) +efr32-brd4187c-lock +efr32-brd4187c-lock-rpc +efr32-brd4187c-lock-rpc-with-ota-requestor (NOGLOB: Reduce default build variants) +efr32-brd4187c-lock-with-ota-requestor (NOGLOB: Reduce default build variants) +efr32-brd4187c-switch +efr32-brd4187c-switch-with-ota-requestor (NOGLOB: Reduce default build variants) +efr32-brd4187c-unit-test +efr32-brd4187c-unit-test-with-ota-requestor (NOGLOB: Reduce default build variants) +efr32-brd4187c-window-covering +efr32-brd4187c-window-covering-with-ota-requestor (NOGLOB: Reduce default build variants) efr32-brd4304a-light (NOGLOB: only user requested) efr32-brd4304a-light-rpc (NOGLOB: only user requested) efr32-brd4304a-light-rpc-with-ota-requestor (NOGLOB: only user requested) diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 48b2f68c78ba30..90dce607c7ab88 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -487,6 +487,48 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa # Generating efr32-brd4187a-window-covering-with-ota-requestor gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=silabs_board="BRD4187A" chip_enable_ota_requestor=true' {out}/efr32-brd4187a-window-covering-with-ota-requestor +# Generating efr32-brd4187c-light +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-light + +# Generating efr32-brd4187c-light-rpc +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4187c-light-rpc + +# Generating efr32-brd4187c-light-rpc-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") chip_enable_ota_requestor=true' {out}/efr32-brd4187c-light-rpc-with-ota-requestor + +# Generating efr32-brd4187c-light-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-light-with-ota-requestor + +# Generating efr32-brd4187c-lock +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-lock + +# Generating efr32-brd4187c-lock-rpc +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4187c-lock-rpc + +# Generating efr32-brd4187c-lock-rpc-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") chip_enable_ota_requestor=true' {out}/efr32-brd4187c-lock-rpc-with-ota-requestor + +# Generating efr32-brd4187c-lock-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-lock-with-ota-requestor + +# Generating efr32-brd4187c-switch +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/light-switch-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-switch + +# Generating efr32-brd4187c-switch-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/light-switch-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-switch-with-ota-requestor + +# Generating efr32-brd4187c-unit-test +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-unit-test + +# Generating efr32-brd4187c-unit-test-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-unit-test-with-ota-requestor + +# Generating efr32-brd4187c-window-covering +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-window-covering + +# Generating efr32-brd4187c-window-covering-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-window-covering-with-ota-requestor + # Generating efr32-brd4304a-light gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4304A"' {out}/efr32-brd4304a-light @@ -1889,6 +1931,48 @@ ninja -C {out}/efr32-brd4187a-window-covering # Building efr32-brd4187a-window-covering-with-ota-requestor ninja -C {out}/efr32-brd4187a-window-covering-with-ota-requestor +# Building efr32-brd4187c-light +ninja -C {out}/efr32-brd4187c-light + +# Building efr32-brd4187c-light-rpc +ninja -C {out}/efr32-brd4187c-light-rpc + +# Building efr32-brd4187c-light-rpc-with-ota-requestor +ninja -C {out}/efr32-brd4187c-light-rpc-with-ota-requestor + +# Building efr32-brd4187c-light-with-ota-requestor +ninja -C {out}/efr32-brd4187c-light-with-ota-requestor + +# Building efr32-brd4187c-lock +ninja -C {out}/efr32-brd4187c-lock + +# Building efr32-brd4187c-lock-rpc +ninja -C {out}/efr32-brd4187c-lock-rpc + +# Building efr32-brd4187c-lock-rpc-with-ota-requestor +ninja -C {out}/efr32-brd4187c-lock-rpc-with-ota-requestor + +# Building efr32-brd4187c-lock-with-ota-requestor +ninja -C {out}/efr32-brd4187c-lock-with-ota-requestor + +# Building efr32-brd4187c-switch +ninja -C {out}/efr32-brd4187c-switch + +# Building efr32-brd4187c-switch-with-ota-requestor +ninja -C {out}/efr32-brd4187c-switch-with-ota-requestor + +# Building efr32-brd4187c-unit-test +ninja -C {out}/efr32-brd4187c-unit-test + +# Building efr32-brd4187c-unit-test-with-ota-requestor +ninja -C {out}/efr32-brd4187c-unit-test-with-ota-requestor + +# Building efr32-brd4187c-window-covering +ninja -C {out}/efr32-brd4187c-window-covering + +# Building efr32-brd4187c-window-covering-with-ota-requestor +ninja -C {out}/efr32-brd4187c-window-covering-with-ota-requestor + # Building efr32-brd4304a-light ninja -C {out}/efr32-brd4304a-light diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt index ecf21d637c058a..15ba044b6a52e4 100644 --- a/scripts/build/testdata/glob_star_targets_except_host.txt +++ b/scripts/build/testdata/glob_star_targets_except_host.txt @@ -38,6 +38,13 @@ efr32-brd4161a-lock-rpc efr32-brd4161a-switch efr32-brd4161a-unit-test efr32-brd4161a-window-covering +efr32-brd4187c-light +efr32-brd4187c-light-rpc +efr32-brd4187c-lock +efr32-brd4187c-lock-rpc +efr32-brd4187c-switch +efr32-brd4187c-unit-test +efr32-brd4187c-window-covering esp32-c3devkit-all-clusters esp32-c3devkit-all-clusters-minimal esp32-devkitc-all-clusters From 88ca922b8f20bbfca8cf39d2fe68220188858c09 Mon Sep 17 00:00:00 2001 From: jepenven-silabs Date: Mon, 3 Oct 2022 14:52:11 -0400 Subject: [PATCH 3/3] fix ci --- .../build/testdata/build_all_except_host.txt | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 90dce607c7ab88..b131ac868ecadc 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -488,46 +488,46 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=silabs_board="BRD4187A" chip_enable_ota_requestor=true' {out}/efr32-brd4187a-window-covering-with-ota-requestor # Generating efr32-brd4187c-light -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-light +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4187C"' {out}/efr32-brd4187c-light # Generating efr32-brd4187c-light-rpc -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4187c-light-rpc +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4187c-light-rpc # Generating efr32-brd4187c-light-rpc-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") chip_enable_ota_requestor=true' {out}/efr32-brd4187c-light-rpc-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") chip_enable_ota_requestor=true' {out}/efr32-brd4187c-light-rpc-with-ota-requestor # Generating efr32-brd4187c-light-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-light-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-light-with-ota-requestor # Generating efr32-brd4187c-lock -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-lock +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=silabs_board="BRD4187C"' {out}/efr32-brd4187c-lock # Generating efr32-brd4187c-lock-rpc -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4187c-lock-rpc +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4187c-lock-rpc # Generating efr32-brd4187c-lock-rpc-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") chip_enable_ota_requestor=true' {out}/efr32-brd4187c-lock-rpc-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") chip_enable_ota_requestor=true' {out}/efr32-brd4187c-lock-rpc-with-ota-requestor # Generating efr32-brd4187c-lock-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-lock-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/efr32 '--args=silabs_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-lock-with-ota-requestor # Generating efr32-brd4187c-switch -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/light-switch-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-switch +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/light-switch-app/efr32 '--args=silabs_board="BRD4187C"' {out}/efr32-brd4187c-switch # Generating efr32-brd4187c-switch-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/light-switch-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-switch-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/light-switch-app/efr32 '--args=silabs_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-switch-with-ota-requestor # Generating efr32-brd4187c-unit-test -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-unit-test +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=silabs_board="BRD4187C"' {out}/efr32-brd4187c-unit-test # Generating efr32-brd4187c-unit-test-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-unit-test-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/src/test_driver/efr32 '--args=silabs_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-unit-test-with-ota-requestor # Generating efr32-brd4187c-window-covering -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4187C"' {out}/efr32-brd4187c-window-covering +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=silabs_board="BRD4187C"' {out}/efr32-brd4187c-window-covering # Generating efr32-brd4187c-window-covering-with-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-window-covering-with-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/window-app/efr32 '--args=silabs_board="BRD4187C" chip_enable_ota_requestor=true' {out}/efr32-brd4187c-window-covering-with-ota-requestor # Generating efr32-brd4304a-light gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4304A"' {out}/efr32-brd4304a-light