Align header include paths between Release and Debug configuration (#…

…7632) * Align header include paths between Release and Debug configuration * Add a CI step for release configurations * Try and make restyled happy * Fix format
project-chip · Jun 16, 2021 · 33ee77a · 33ee77a
1 parent b728b74
commit 33ee77a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
@@ -56,10 +56,14 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Run iOS Build
+            - name: Run iOS Build Debug
               timeout-minutes: 15
               working-directory: src/darwin/Framework
               run: xcodebuild -target "CHIP" -sdk iphoneos
+            - name: Run iOS Build Release
+              timeout-minutes: 15
+              working-directory: src/darwin/Framework
+              run: xcodebuild -target "CHIP" -sdk iphoneos -configuration Release
             - name: Clean Build
               run: xcodebuild clean
               working-directory: src/darwin/Framework

diff --git a/src/app/util/binding-table.cpp b/src/app/util/binding-table.cpp
@@ -19,8 +19,8 @@
  * @file Basic implementation of a binding table.
  */
 
-#include "gen/gen_config.h"
 #include <app/util/binding-table.h>
+#include <gen/gen_config.h>
 
 static EmberBindingTableEntry bindingTable[EMBER_BINDING_TABLE_SIZE];
 

diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
@@ -724,8 +724,11 @@
 					"$(CHIP_ROOT)/src/app",
 					"$(CHIP_ROOT)/config/ios",
 					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
-					.,
+					"$(CHIP_ROOT)/src/darwin/Framework/CHIP/",
+					"$(CHIP_ROOT)/src/app/util",
+					"$(CHIP_ROOT)/third_party/nlio/repo/include",
 					"$(TEMP_DIR)/out/gen/include",
+					"$(CHIP_ROOT)/src/controller/data_model",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";