Update action to use macos-13 as 12 now deprecated

streetpea · Dec 13, 2024 · 7d6f88f · 7d6f88f
1 parent b89b96f
commit 7d6f88f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/build-macos-x86.yml b/.github/workflows/build-macos-x86.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   build-mac_x64:
     name: Build macOSX x86_64 version
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
@@ -19,7 +19,7 @@ jobs:
       - name: Install brew dependencies
         run: |
           brew update
-          brew install --force qt@6 ffmpeg pkgconfig opus openssl cmake ninja nasm sdl2 protobuf speexdsp libplacebo wget python-setuptools json-c miniupnpc
+          brew install --force qt@6 ffmpeg pkgconfig opus openssl cmake ninja nasm sdl2 protobuf speexdsp libplacebo wget python-setuptools json-c miniupnpc || true
 
       - name: Configure chiaki-ng
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -272,3 +272,11 @@ endif()
 if(CHIAKI_ENABLE_BOREALIS)
 	add_subdirectory(switch)
 endif()
+
+if(APPLE)
+	if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+		set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0.0)
+	else()
+		set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10.0)
+	endif()
+endif()
diff --git a/gui/MacOSXBundleInfo.plist.in b/gui/MacOSXBundleInfo.plist.in
@@ -14,6 +14,8 @@
 	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
 	<key>CFBundleName</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundlePackageType</key>