From b0c5f47695b4bcf28e3fb629d1809b242cc04c69 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 30 Jan 2022 12:10:23 -0800 Subject: [PATCH] ci: wrap symbol generation in x86_64 if since we don't have crashpad yet --- .github/workflows/ci.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4c5f0f38..f41edf68b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -382,9 +382,10 @@ jobs: MACDEPLOYQT=$(pwd)/opt/olive-editor/bin/macdeployqt else MACDEPLOYQT=$DEP_LOCATION/bin/macdeployqt + MACDEPLOYQT_ARGS="-executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler" fi - $MACDEPLOYQT $BUNDLE_NAME -executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler + $MACDEPLOYQT $BUNDLE_NAME $MACDEPLOYQT_ARGS $DOWNLOAD_TOOL https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive $DEP_LOCATION @@ -397,12 +398,15 @@ jobs: done done - # 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 - SYM_DIR=$BUNDLE_NAME/Contents/Resources/symbols/Olive/${SYM_HEADER[3]} - mkdir -p "$SYM_DIR" - mv Olive.sym "$SYM_DIR" + if [ "${{ matrix.os-arch }}" == "x86_64" ] + then + # 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 + SYM_DIR=$BUNDLE_NAME/Contents/Resources/symbols/Olive/${SYM_HEADER[3]} + mkdir -p "$SYM_DIR" + mv Olive.sym "$SYM_DIR" + fi - name: Deploy Packages working-directory: ${{ runner.workspace }}/build