Fix CI and apply comments

project-chip · May 18, 2023 · d2ccd4d · d2ccd4d
1 parent cf07ea4
commit d2ccd4d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -109,11 +109,11 @@ jobs:
         run: |
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
              efr32 BRD4187C lighting-app \
-             out/efr32-brd4187c-light-rpc/chip-efr32-lighting-example.out \
+             out/efr32-brd4187c-light-rpc/matter-silabs-lighting-example.out \
              /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py  \
              efr32 BRD4187C window-app \
-             out/efr32-brd4187c-window-covering-additional_data_advertising/chip-efr32-window-example.out \
+             out/efr32-brd4187c-window-covering-additional_data_advertising/matter-silabs-window-example.out \
              /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
@@ -122,15 +122,15 @@ jobs:
         run: |
           scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
-            out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
+            out/lock_app_wifi_wf200/BRD4161A/matter-silabs-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
       - name: Build example EFR32+RS9116 WiFi Lighting app for BRD4161A
         timeout-minutes: 15
         run: |
           scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs9116 lighting-app \
-            out/lighting_app_wifi_rs9116/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
+            out/lighting_app_wifi_rs9116/BRD4161A/matter-silabs-lighting-example.out /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
       - name: Uploading Size Reports

diff --git a/examples/light-switch-app/silabs/efr32/BUILD.gn b/examples/light-switch-app/silabs/efr32/BUILD.gn
@@ -113,7 +113,7 @@ if (wifi_soc) {
 }
 
 silabs_executable("light_switch_app") {
-  output_name = "chip-silabs-light-switch-example.out"
+  output_name = "matter-silabs-light-switch-example.out"
   include_dirs = [
     "include",
     "${chip_root}/examples/light-switch-app/silabs/common/",

diff --git a/examples/lighting-app/silabs/efr32/BUILD.gn b/examples/lighting-app/silabs/efr32/BUILD.gn
@@ -124,7 +124,7 @@ if (wifi_soc) {
   }
 }
 silabs_executable("lighting_app") {
-  output_name = "chip-silabs-lighting-example.out"
+  output_name = "matter-silabs-lighting-example.out"
   include_dirs = [ "include" ]
   defines = []
 

diff --git a/examples/lock-app/silabs/efr32/BUILD.gn b/examples/lock-app/silabs/efr32/BUILD.gn
@@ -112,7 +112,7 @@ if (wifi_soc) {
 }
 
 silabs_executable("lock_app") {
-  output_name = "chip-silabs-lock-example.out"
+  output_name = "matter-silabs-lock-example.out"
   include_dirs = [ "include" ]
   defines = []
 

diff --git a/examples/thermostat/silabs/efr32/BUILD.gn b/examples/thermostat/silabs/efr32/BUILD.gn
@@ -129,7 +129,7 @@ if (wifi_soc) {
 }
 
 silabs_executable("thermostat_app") {
-  output_name = "chip-silabs-thermostat-example.out"
+  output_name = "matter-silabs-thermostat-example.out"
   include_dirs = [ "include" ]
   defines = []
 

diff --git a/examples/window-app/silabs/efr32/BUILD.gn b/examples/window-app/silabs/efr32/BUILD.gn
@@ -97,7 +97,7 @@ if (wifi_soc) {
 }
 
 silabs_executable("window_app") {
-  output_name = "chip-silabs-window-example.out"
+  output_name = "matter-silabs-window-example.out"
   output_dir = root_out_dir
   include_dirs = [
     "include",

diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
@@ -27,7 +27,6 @@ if (silabs_board == "BRD4325B") {  # CCP board
 declare_args() {
   # Build target to use for efr32 SDK. Use this to set global SDK defines.
   silabs_sdk_target = ""
-  silabs_sdk_target = ""
 
   use_thread_coap_lib = false
   sl_matter_version_str = ""