From dadcc1a4be3942195f0b9c79a271df0a1b64a97b Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:34:31 -0800 Subject: [PATCH] ci: update for new windows deps --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d6c8c727..c01a75a36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,10 +192,9 @@ jobs: shell: bash working-directory: ${{ runner.workspace }} run: | - $DOWNLOAD_TOOL https://github.com/olive-editor/vcpkg-registry/releases/download/continuous/olive-dep-x64-windows.zip - 7z x olive-dep-x64-windows.zip - VCPKG_DIR=(vcpkg-export-*) - echo "VCPKG_ROOT=$(pwd -W)/$VCPKG_DIR" >> $GITHUB_ENV + $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 - name: Acquire Google Crashpad shell: bash @@ -228,9 +227,10 @@ jobs: cd build cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ - -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/core/install" \ + -DCMAKE_INSTALL_PREFIX="install" \ $CMAKE_ARGS ninja install + echo "$(pwd -W)/install" >> $GITHUB_PATH - name: Configure CMake shell: bash @@ -238,7 +238,6 @@ jobs: run: | PATH=$GITHUB_WORKSPACE/core/install:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ - -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ $CMAKE_ARGS - name: Build