From a565cae5d8a6ff33dd9409780d7055cbc6bdbded Mon Sep 17 00:00:00 2001
From: Eric Warmenhoven <eric@warmenhoven.org>
Date: Mon, 7 Oct 2024 06:37:56 -0400
Subject: [PATCH] macOS: Update App Store packaging script (#17081)

---
 .../xcschemes/RetroArch AppStore.xcscheme     | 84 +++++++++++++++++++
 pkg/apple/fastlane/Fastfile                   |  8 +-
 2 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 pkg/apple/RetroArch_Metal.xcodeproj/xcshareddata/xcschemes/RetroArch AppStore.xcscheme

diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/xcshareddata/xcschemes/RetroArch AppStore.xcscheme b/pkg/apple/RetroArch_Metal.xcodeproj/xcshareddata/xcschemes/RetroArch AppStore.xcscheme
new file mode 100644
index 0000000000..a3bc0b57a3
--- /dev/null
+++ b/pkg/apple/RetroArch_Metal.xcodeproj/xcshareddata/xcschemes/RetroArch AppStore.xcscheme	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "07F2BBC32BE83A4700FD1295"
+               BuildableName = "RetroArch.app"
+               BlueprintName = "RetroArch AppStore"
+               ReferencedContainer = "container:RetroArch_Metal.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      disableMainThreadChecker = "YES"
+      disablePerformanceAntipatternChecker = "YES"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "NO"
+      debugXPCServices = "NO"
+      debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "NO"
+      viewDebuggingEnabled = "No"
+      queueDebuggingEnabled = "No">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "07F2BBC32BE83A4700FD1295"
+            BuildableName = "RetroArch.app"
+            BlueprintName = "RetroArch AppStore"
+            ReferencedContainer = "container:RetroArch_Metal.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "07F2BBC32BE83A4700FD1295"
+            BuildableName = "RetroArch.app"
+            BlueprintName = "RetroArch AppStore"
+            ReferencedContainer = "container:RetroArch_Metal.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/pkg/apple/fastlane/Fastfile b/pkg/apple/fastlane/Fastfile
index de5c4d7441..bd15499164 100644
--- a/pkg/apple/fastlane/Fastfile
+++ b/pkg/apple/fastlane/Fastfile
@@ -31,9 +31,9 @@ platform :mac do
         "./OSX/Info_AppStore.plist"
       ]
     )
-    # ensure_git_status_clean
-    # git_pull
-    # sh("git log -1")
+    ensure_git_status_clean
+    git_pull
+    sh("git log -1")
     begin
       app_store_build_number(
         app_identifier: "com.libretro.dist.RetroArch",
@@ -77,7 +77,7 @@ platform :mac do
     build_mac_app(
       workspace: "RetroArch.xcworkspace",
       scheme: "RetroArch AppStore",
-      xcodebuild_formatter: 'xcpretty',
+      xcodebuild_formatter: 'xcbeautify --renderer github-actions',
       buildlog_path: "buildlog",
       export_method: "app-store",
       export_options: {