Update ci.yml
This commit is contained in:
@@ -190,6 +190,7 @@ jobs:
|
||||
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
|
||||
-DCMAKE_INSTALL_PREFIX="$(pwd)/install"
|
||||
ninja install
|
||||
echo "$(pwd)/install" >> $GITHUB_PATH
|
||||
|
||||
- name: Acquire Google Crashpad
|
||||
shell: bash
|
||||
@@ -197,6 +198,8 @@ jobs:
|
||||
run: |
|
||||
$DOWNLOAD_TOOL https://github.com/olive-editor/crashpad/releases/download/continuous/crashpad-win32-RelWithDebInfo.tar.gz
|
||||
tar xzf crashpad-win32-RelWithDebInfo.tar.gz
|
||||
echo "$GITHUB_WORKSPACE/install" >> $GITHUB_PATH
|
||||
echo "$GITHUB_WORKSPACE/install/crashpad" >> $GITHUB_PATH
|
||||
|
||||
- name: Generate Patreon List
|
||||
shell: bash
|
||||
@@ -210,12 +213,9 @@ jobs:
|
||||
|
||||
- name: Configure CMake
|
||||
shell: bash
|
||||
env:
|
||||
DEP_LOCATION: ${{ runner.workspace }}/install
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
run: |
|
||||
PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$GITHUB_WORKSPACE/OpenColorIO/build/install:$PATH \
|
||||
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \
|
||||
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \
|
||||
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
|
||||
|
||||
- name: Build
|
||||
@@ -227,16 +227,12 @@ jobs:
|
||||
- name: Test
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
shell: bash
|
||||
env:
|
||||
DEP_LOCATION: ${{ runner.workspace }}/install
|
||||
run: |
|
||||
PATH=$PATH:$DEP_LOCATION/bin ctest -C ${{ matrix.build-type }} -V
|
||||
ctest -C ${{ matrix.build-type }} -V
|
||||
|
||||
- name: Create Package
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
shell: bash
|
||||
env:
|
||||
DEP_LOCATION: ${{ runner.workspace }}/install
|
||||
run: |
|
||||
mkdir olive-editor
|
||||
cp app/olive-editor.exe olive-editor
|
||||
@@ -245,9 +241,9 @@ jobs:
|
||||
$VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe
|
||||
$VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe
|
||||
cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor
|
||||
cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor
|
||||
cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor
|
||||
cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor
|
||||
cp $(cygpath $GITHUB_WORKSPACE)/install/bin/*.dll olive-editor
|
||||
cp $(cygpath $GITHUB_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor
|
||||
cp $(cygpath $GITHUB_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor
|
||||
|
||||
- name: Export Crashpad symbols
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
@@ -360,7 +356,7 @@ jobs:
|
||||
run: |
|
||||
brew install ninja
|
||||
PATH=/opt/olive-editor/bin:/opt/olive-editor/crashpad:$PATH \
|
||||
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" -DCMAKE_INSTALL_PREFIX=$DEP_LOCATION
|
||||
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}"
|
||||
|
||||
- name: Build
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
|
||||
Reference in New Issue
Block a user