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
This commit is contained in:
itsmattkc
2022-01-30 11:36:48 -08:00
parent 7bb07d21a2
commit f7b1b3b1c0
+12 -1
View File
@@ -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