From f7b1b3b1c04035a2f33ed4fe07f8375a7222d7ee Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Sun, 30 Jan 2022 11:36:48 -0800
Subject: [PATCH] ci: acquire x86_64 macdeployqt

No idea if this will work, hopefully macdeployqt is smart enough to use the ARM64 versions of Qt libraries rather than its own x86_64 versions
---
 .github/workflows/ci.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f668f18d..e1fcfb663 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -373,7 +373,18 @@ jobs:
         run: |
           # Use macdeployqt and macdeployqt to bundle dependencies
           mv app/$BUNDLE_NAME .
-          $DEP_LOCATION/bin/macdeployqt $BUNDLE_NAME -executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler
+
+          if [ "${{ matrix.os-arch }}" != "x86_64" ]
+          then
+            # Must acquire Qt tools from x86_64 package
+            $DOWNLOAD_TOOL https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-mac-x86_64.tar.gz
+            tar xzf https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-mac-x86_64.tar.gz
+            MACDEPLOYQT=$(pwd)/opt/olive-editor/bin/macdeployqt
+          else
+            MACDEPLOYQT=$DEP_LOCATION/bin/macdeployqt
+          fi
+
+          $MACDEPLOYQT $BUNDLE_NAME -executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler
           $DOWNLOAD_TOOL https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
           python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive $DEP_LOCATION