Silicon CI

calebwest-SS · Apr 5, 2023 · b74cb70 · b74cb70
1 parent a1e89d0
commit b74cb70
Show file tree

Hide file tree

Showing 13 changed files with 1,405 additions and 920 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -92,6 +92,19 @@ jobs:
     # if: false # tmp disable
     name: OSX
     runs-on: macos-latest
+
+    strategy:
+      matrix:
+        include:
+        - arch: x86_64
+          suffix: intel
+          config: Release
+
+        - arch: arm64
+          suffix: silicon
+          config: ReleaseSilicon
+
+      fail-fast: false
 
     steps:
       - name: Checkout repo
@@ -110,7 +123,7 @@ jobs:
         id: set_variables
         uses: ./.github/actions/set-suffix
         with:
-          os: 'osx'
+          os: 'osx-${{ matrix.suffix }}'
 
       - name: Download Packages 
         run: |
@@ -120,13 +133,14 @@ jobs:
           hdiutil detach "/Volumes/Packages ${{ env.PackagesVersion }}/"
 
       - name: Build
-        uses: sersoft-gmbh/xcodebuild-action@v1.3
+        uses: sersoft-gmbh/xcodebuild-action@v2.0.1
         with:
           project: Builds/MacOSX_CI/${{ env.ProjectName }}.xcodeproj
           destination: platform=macOS
           jobs: 2
           action: build
-          configuration: Release
+          arch: ${{ matrix.arch }}
+          configuration: ${{ matrix.config }}
           use-xcpretty: true
 
       - name: Create Package

diff --git a/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj
diff --git a/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj
@@ -3756,7 +3756,7 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
-		6FCF7C24C8368E66D219862A /* Release */ = {
+		20A8C5A48ED1E7E2247619AB /* ReleaseSilicon */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -3801,9 +3801,9 @@
 				WARNING_CFLAGS = "-Wreorder";
 				ZERO_LINK = NO;
 			};
-			name = Release;
+			name = ReleaseSilicon;
 		};
-		CF7691989E5C2BC122F151FD /* Debug */ = {
+		6FCF7C24C8368E66D219862A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -3843,30 +3843,29 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "Chataigne";
 				SDKROOT = macosx;
 				WARNING_CFLAGS = "-Wreorder";
 				ZERO_LINK = NO;
 			};
-			name = Debug;
+			name = Release;
 		};
-		D4D56509A9AFA8EF19844BC6 /* Debug */ = {
+		88314D01A007669275B0FC54 /* ReleaseSilicon */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_LINK_OBJC_RUNTIME = NO;
 				COMBINE_HIDPI_IMAGES = YES;
-				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
-				COPY_PHASE_STRIP = NO;
+				CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../Release";
+				DEAD_CODE_STRIPPING = YES;
 				EXCLUDED_ARCHS = "i386 arm64";
 				FRAMEWORK_SEARCH_PATHS = ("$(SRCROOT)/../../External/sdl/lib/osx", "$(inherited)");
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"_DEBUG=1",
-					"DEBUG=1",
+					"_NDEBUG=1",
+					"NDEBUG=1",
 					"VST_LOGGING=0",
 					"JUCE_SUPPORT_CARBON=0",
 					"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
@@ -3914,11 +3913,12 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"../../External/servus/lib/osx/debug\"",
-					"\"../../External/joycon/lib/osx\"",
+					"\"../../External/servus/lib/silicon/release\"",
+					"\"../../External/joycon/lib/silicon\"",
 					"\"../../Modules/juce_simpleweb/libs/MacOSX\"",
 					"\"../../Modules/juce_simpleweb/libs/MacOSX/${CURRENT_ARCH}\"",
 				);
+				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../JUCE/modules $(SRCROOT)/../../Modules $(SRCROOT)/../../Source $(SRCROOT)/../../External/wiiuse $(SRCROOT)/../../External/serial/include $(SRCROOT)/../../External/asio $(SRCROOT)/../../External/asiodriver $(SRCROOT)/../../External/kinect/include $(SRCROOT)/../../External/joycon/include $(SRCROOT)/../../External/servus/include $(SRCROOT)/../../External/dnssd/include $(SRCROOT)/../../External/ois/include $(SRCROOT)/../../External/sdl/include $(SRCROOT)/../../External/hidapi/include $(SRCROOT)/../../External/abletonlink/include $(SRCROOT)/../../External/libusb/include/libusb-1.0 $(SRCROOT)/../../External/mosquitto/include $(SRCROOT)/../../External/posistagenet/include $(SRCROOT)/../../External/simpleble/include";
 				OTHER_LDFLAGS = "-lServus -lhidapi -lJoyShockLibrary -lssl -lcrypto -lz -weak_framework Metal -weak_framework MetalKit";
@@ -3928,7 +3928,7 @@
 				VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL;
 				VALID_ARCHS = "arm64e x86_64";
 			};
-			name = Debug;
+			name = ReleaseSilicon;
 		};
 		E045C481EC242ED399656803 /* Release */ = {
 			isa = XCBuildConfiguration;
@@ -3937,7 +3937,7 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_LINK_OBJC_RUNTIME = NO;
 				COMBINE_HIDPI_IMAGES = YES;
-				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
+				CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../Release";
 				DEAD_CODE_STRIPPING = YES;
 				EXCLUDED_ARCHS = "i386 arm64";
 				FRAMEWORK_SEARCH_PATHS = ("$(SRCROOT)/../../External/sdl/lib/osx", "$(inherited)");
@@ -4016,20 +4016,20 @@
 		3B0D3344B40620C12AA6A54C = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
+				20A8C5A48ED1E7E2247619AB,
 				6FCF7C24C8368E66D219862A,
-				CF7691989E5C2BC122F151FD,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = Release;
 		};
 		59654CEDCD4488BCC04B2DBD = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D4D56509A9AFA8EF19844BC6,
 				E045C481EC242ED399656803,
+				88314D01A007669275B0FC54,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};