From ff0438a3fd25febfd8fc3ef362bbc2c2192f0006 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 30 Apr 2020 13:39:29 -0700 Subject: Github Actions: don't bundle mac app There's no point in doing that since the app directory this creates is broken on older macOS versions, anyway (and we create a working DMG through a webhook). Additionally, lately this has started to fail on GitHub, so let's just rip this out. Signed-off-by: Dirk Hohndel --- .github/workflows/mac.yml | 48 ----------------------------------------------- 1 file changed, 48 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 6d5fc09d4..af1a5d539 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -67,51 +67,3 @@ jobs: cd ${GITHUB_WORKSPACE}/build/tests make check - - name: package Subsurface - run: | - cd ${GITHUB_WORKSPACE}/build - # next build and install Subsurface and then clean up the staging area - LIBRARY_PATH=${DIR}/install-root/lib make -j2 install - - # now adjust a few references that macdeployqt appears to miss - EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface - for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do - OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") - if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${OLD}) ]] ; then - # copy the library into the bundle and make sure its id and the reference to it are correct - cp ${DIR}/install-root/lib/$(basename ${OLD}) Subsurface.app/Contents/Frameworks - SONAME=$(basename $OLD) - install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE} - install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME} - fi - done - - # next, replace @rpath references with @executable_path references in Subsurface - RPATH=$(otool -L ${EXECUTABLE} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) - for i in ${RPATH}; do - install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE} - done - - # next deal with libGrantlee - LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib) - for i in QtScript.framework/Versions/5/QtScript QtCore.framework/Versions/5/QtCore ; do - install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${LIBG} - done - - # clean up shared library dependency in the Grantlee plugins - GRANTLEE_VERSION=$(basename Subsurface.app/Contents/PlugIns/grantlee/5.*) - for i in Subsurface.app/Contents/PlugIns/grantlee/${GRANTLEE_VERSION}/*.so; do - OLD=$(otool -L $i | grep libGrantlee_Templates | cut -d\ -f1 | tr -d "\t") - SONAME=$(basename $OLD ) - install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} $i; - OLD=$(otool -L $i | grep QtCore | cut -d\ -f1 | tr -d "\t") - install_name_tool -change ${OLD} @executable_path/../Frameworks/QtCore.framework/QtCore $i; - pushd Subsurface.app/Contents/PlugIns/grantlee - ln -s ${GRANTLEE_VERSION}/$(basename $i) . - popd - done - - name: store artifact - uses: actions/upload-artifact@master - with: - name: Subsurface.app - path: build/Subsurface.app -- cgit v1.2.3-70-g09d2