Fix build CI

project-chip · May 23, 2023 · d20404d · d20404d
1 parent 385683b
commit d20404d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -87,7 +87,7 @@ jobs:
       - name: Test SLC gen
         timeout-minutes: 30
         run: |
-          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs/efr32 ./out/light-app BRD4187C --slc_generate --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
           rm -rf ./out/
       - name: Build some BRD4187C variants
         timeout-minutes: 90
@@ -120,15 +120,15 @@ jobs:
       - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_silabs_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
+          scripts/examples/gn_silabs_example.sh examples/lock-app/silabs 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/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_silabs_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs 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/matter-silabs-lighting-example.out /tmp/bloat_reports/
       - name: Clean out build output

diff --git a/examples/light-switch-app/silabs/BUILD.gn b/examples/light-switch-app/silabs/BUILD.gn
@@ -113,16 +113,14 @@ if (wifi_soc) {
 
 silabs_executable("light_switch_app") {
   output_name = "matter-silabs-light-switch-example.out"
-  include_dirs = [
-    "include",
-  ]
+  include_dirs = [ "include" ]
   defines = []
 
   sources = [
-    "src/BindingHandler.cpp",
-    "src/LightSwitchMgr.cpp",
     "${examples_common_plat_dir}/main.cpp",
     "src/AppTask.cpp",
+    "src/BindingHandler.cpp",
+    "src/LightSwitchMgr.cpp",
     "src/ZclCallbacks.cpp",
   ]
 
@@ -138,9 +136,7 @@ silabs_executable("light_switch_app") {
   }
 
   if (chip_build_libshell) {
-    sources += [
-      "src/ShellCommands.cpp",
-    ]
+    sources += [ "src/ShellCommands.cpp" ]
   }
 
   if (chip_enable_pw_rpc) {

diff --git a/examples/window-app/silabs/src/AppTask.cpp b/examples/window-app/silabs/src/AppTask.cpp
@@ -21,7 +21,6 @@
 #include "AppConfig.h"
 #include "AppEvent.h"
 
-
 // #include <app/clusters/identify-server/identify-server.h>
 // #include <app/clusters/on-off-server/on-off-server.h>
 // #include <app/server/OnboardingCodesUtil.h>
@@ -275,7 +274,6 @@ void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
     // }
 }
 
-
 void AppTask::UpdateClusterState(intptr_t context)
 {
     // uint8_t newValue = LightMgr().IsLightOn();

diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py
@@ -78,7 +78,7 @@ def BuildRoot(self, root):
         if self == Efr32App.UNIT_TEST:
             return os.path.join(root, 'src', 'test_driver', 'efr32')
         else:
-            return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32')
+            return os.path.join(root, 'examples', self.ExampleName(), 'silabs')
 
 
 class Efr32Board(Enum):