From b91fbf3f8e5c7ec3e75eff8505c0c8855a411bab Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Wed, 31 May 2023 03:01:12 -0700
Subject: [PATCH] ci: Fix macOS bundle validity issues. (#6572)

* ci: Fix improper copying of macOS artifacts.

* ci: Resign universal macOS app after combining.
---
 .ci/macos/universal.sh | 6 ++++++
 .ci/macos/upload.sh    | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.ci/macos/universal.sh b/.ci/macos/universal.sh
index 062de95417..6bc52b8caf 100755
--- a/.ci/macos/universal.sh
+++ b/.ci/macos/universal.sh
@@ -42,4 +42,10 @@ for OTHER_ARTIFACT in "${ARTIFACTS_LIST[@]:1}"; do
     done
 done
 
+# Re-sign executables and bundles after combining.
+APP_PATHS=(citra citra-room citra-qt.app)
+for APP_PATH in "${APP_PATHS[@]}"; do
+    codesign --deep -fs - $REV_NAME/$APP_PATH
+done
+
 . .ci/common/post-upload.sh
diff --git a/.ci/macos/upload.sh b/.ci/macos/upload.sh
index c90c3038f7..c529d28ef1 100755
--- a/.ci/macos/upload.sh
+++ b/.ci/macos/upload.sh
@@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-czvf"
 
 mkdir "$REV_NAME"
 
-cp build/bin/Release/citra "$REV_NAME"
-cp -r build/bin/Release/libs "$REV_NAME"
-cp -r build/bin/Release/citra-qt.app "$REV_NAME"
-cp build/bin/Release/citra-room "$REV_NAME"
+cp -a build/bin/Release/citra "$REV_NAME"
+cp -a build/bin/Release/libs "$REV_NAME"
+cp -a build/bin/Release/citra-qt.app "$REV_NAME"
+cp -a build/bin/Release/citra-room "$REV_NAME"
 
 . .ci/common/post-upload.sh