From eeaaa22c9b1319708d4c3323688173417ffbaf5f Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 15 Feb 2023 23:00:14 -0800 Subject: [PATCH] ci: fix windows deployment issues --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39940a216..908aeb136 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,6 +195,7 @@ jobs: $DOWNLOAD_TOOL https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-win32-Release.tar.gz tar xzf olive-dep-win32-Release.tar.gz echo "$(pwd -W)/install" >> $GITHUB_PATH + echo "$(pwd -W)/install/bin" >> $GITHUB_PATH - name: Acquire Google Crashpad shell: bash @@ -249,7 +250,7 @@ jobs: working-directory: ${{ runner.workspace }}/build shell: bash run: | - PATH=$PATH:$VCPKG_ROOT/installed/x64-windows/bin ctest -C ${{ matrix.build-type }} -V + ctest -C ${{ matrix.build-type }} -V - name: Create Package working-directory: ${{ runner.workspace }}/build @@ -261,8 +262,8 @@ jobs: cp app/olive-editor.exe olive-editor cp app/crashhandler/olive-crashhandler.exe olive-editor cp app/olive-editor.pdb olive-editor - $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 + windeployqt --no-angle olive-editor/olive-crashhandler.exe + windeployqt --no-angle olive-editor/olive-editor.exe cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/*.dll olive-editor cp $(cygpath $ORIGINAL_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor