diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be1aa890a..88b058112 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -283,6 +283,8 @@ jobs: os-arch: x86_64 os: macos-10.15 cmake-gen: Ninja + env: + DEP_LOCATION: /opt/olive-editor name: | ${{ matrix.os-name }} <${{ matrix.compiler-name }}, @@ -310,10 +312,8 @@ jobs: shell: bash working-directory: ${{ runner.workspace }} run: | - $DOWNLOAD_TOOL https://github.com/olive-editor/vcpkg-registry/releases/download/continuous/olive-dep-x64-osx.zip - unzip olive-dep-x64-osx.zip - VCPKG_DIR=(vcpkg-export-*) - echo "VCPKG_ROOT=$(pwd)/$VCPKG_DIR" >> $GITHUB_ENV + $DOWNLOAD_TOOL https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-mac-x86_64.tar.gz + sudo tar xzf olive-dep-mac-x86_64.tar.gz -C / - name: Acquire Google Crashpad shell: bash @@ -336,7 +336,7 @@ jobs: working-directory: ${{ runner.workspace }}/build run: | brew install ninja - PATH=/opt/olive-editor/bin:/opt/olive-editor/crashpad:$PATH \ + PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$PATH \ cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" @@ -361,7 +361,7 @@ jobs: run: | # Use macdeployqt and macdeployqt to bundle dependencies mv app/$BUNDLE_NAME . - $VCPKG_ROOT/installed/x64-osx/tools/qt5-tools/bin/macdeployqt $BUNDLE_NAME -executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler + $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 $VCPKG_ROOT/installed/x64-osx @@ -375,7 +375,7 @@ jobs: done # Crashpad symbols - /opt/olive-editor/bin/dump_syms $BUNDLE_NAME/Contents/MacOS/Olive > Olive.sym + $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"