ci: use new deps for macos
This commit is contained in:
@@ -294,9 +294,6 @@ jobs:
|
|||||||
- name: Checkout Source Code
|
- name: Checkout Source Code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up Homebrew
|
|
||||||
uses: Homebrew/actions/setup-homebrew@master
|
|
||||||
|
|
||||||
- name: Automatically Generate Package Name
|
- name: Automatically Generate Package Name
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
@@ -313,14 +310,10 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
working-directory: ${{ runner.workspace }}
|
working-directory: ${{ runner.workspace }}
|
||||||
run: |
|
run: |
|
||||||
# HACK: Workaround for https://github.com/actions/virtual-environments/issues/4020
|
$DOWNLOAD_TOOL https://github.com/olive-editor/vcpkg-registry/releases/download/continuous/olive-dep-x64-osx.zip
|
||||||
rm -rf /usr/local/bin/2to3
|
unzip olive-dep-x64-osx.zip
|
||||||
|
VCPKG_DIR=(vcpkg-export-*)
|
||||||
brew update
|
echo "VCPKG_ROOT=$(pwd -W)/$VCPKG_DIR" >> $GITHUB_ENV
|
||||||
brew upgrade
|
|
||||||
brew tap olive-editor/homebrew
|
|
||||||
brew install -f qt5 ffmpeg-olive openimageio-olive opencolorio opentimelineio portaudio
|
|
||||||
echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
|
|
||||||
|
|
||||||
- name: Acquire Google Crashpad
|
- name: Acquire Google Crashpad
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -344,7 +337,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
brew install ninja
|
brew install ninja
|
||||||
PATH=/opt/olive-editor/bin:/opt/olive-editor/crashpad:$PATH \
|
PATH=/opt/olive-editor/bin:/opt/olive-editor/crashpad:$PATH \
|
||||||
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}"
|
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"
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: ${{ runner.workspace }}/build
|
working-directory: ${{ runner.workspace }}/build
|
||||||
@@ -366,9 +361,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
# Use macdeployqt and macdeployqt to bundle dependencies
|
# Use macdeployqt and macdeployqt to bundle dependencies
|
||||||
mv app/$BUNDLE_NAME .
|
mv app/$BUNDLE_NAME .
|
||||||
macdeployqt $BUNDLE_NAME -executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler
|
$VCPKG_ROOT/installed/x64-osx/tools/qt5-tools/bin/macdeployqt $BUNDLE_NAME -executable=$BUNDLE_NAME/Contents/MacOS/olive-crashhandler
|
||||||
$DOWNLOAD_TOOL https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
|
$DOWNLOAD_TOOL https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
|
||||||
python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive $(dirname $(which qmake))
|
python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive $VCPKG_ROOT/installed/x64-osx
|
||||||
|
|
||||||
# Manual corrections
|
# Manual corrections
|
||||||
for f in $BUNDLE_NAME/Contents/Frameworks/*.dylib
|
for f in $BUNDLE_NAME/Contents/Frameworks/*.dylib
|
||||||
|
|||||||
Reference in New Issue
Block a user