From b1be00bbf59bffd75c6ea704f2c84bfdf85e1ea7 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 21 Apr 2021 22:16:23 +1000 Subject: [PATCH] ci: remove manual rpath fixes on macOS These fixes have been implemented into our dependency package. --- .github/workflows/ci.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc4e61491..0abba2a9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -348,20 +348,12 @@ jobs: BUNDLE_NAME: "Olive.app" shell: bash 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 $DOWNLOAD_TOOL https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive $DEP_LOCATION - # Manual fixes - cp $DEP_LOCATION/lib/libopentimelineio.dylib $BUNDLE_NAME/Contents/Frameworks - cp $DEP_LOCATION/lib/libopentime.dylib $BUNDLE_NAME/Contents/Frameworks - cp $DEP_LOCATION/lib/libmodplug.dylib $BUNDLE_NAME/Contents/Frameworks - install_name_tool -change @loader_path/libopentimelineio.dylib @rpath/libopentimelineio.dylib $BUNDLE_NAME/Contents/MacOS/Olive - install_name_tool -change @loader_path/libopentime.dylib @rpath/libopentime.dylib $BUNDLE_NAME/Contents/MacOS/Olive - install_name_tool -change libmodplug.dylib @rpath/libmodplug.dylib $BUNDLE_NAME/Contents/Frameworks/libavformat.* - install_name_tool -change libmodplug.dylib @rpath/libmodplug.dylib $BUNDLE_NAME/Contents/Frameworks/libavfilter.* - # Crashpad symbols $DEP_LOCATION/bin/dump_syms $BUNDLE_NAME/Contents/MacOS/Olive > Olive.sym SYM_HEADER=($(head -n 1 Olive.sym)) # Read first line of symbol file