ci: update for new windows deps

This commit is contained in:
itsmattkc
2023-02-15 22:34:31 -08:00
parent aef08f8cdd
commit dadcc1a4be
+5 -6
View File
@@ -192,10 +192,9 @@ jobs:
shell: bash shell: bash
working-directory: ${{ runner.workspace }} working-directory: ${{ runner.workspace }}
run: | run: |
$DOWNLOAD_TOOL https://github.com/olive-editor/vcpkg-registry/releases/download/continuous/olive-dep-x64-windows.zip $DOWNLOAD_TOOL https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-win32-Release.tar.gz
7z x olive-dep-x64-windows.zip tar xzf olive-dep-win32-Release.tar.gz
VCPKG_DIR=(vcpkg-export-*) echo "$(pwd -W)/install" >> $GITHUB_PATH
echo "VCPKG_ROOT=$(pwd -W)/$VCPKG_DIR" >> $GITHUB_ENV
- name: Acquire Google Crashpad - name: Acquire Google Crashpad
shell: bash shell: bash
@@ -228,9 +227,10 @@ jobs:
cd build cd build
cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/core/install" \ -DCMAKE_INSTALL_PREFIX="install" \
$CMAKE_ARGS $CMAKE_ARGS
ninja install ninja install
echo "$(pwd -W)/install" >> $GITHUB_PATH
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
@@ -238,7 +238,6 @@ jobs:
run: | run: |
PATH=$GITHUB_WORKSPACE/core/install:$PATH PATH=$GITHUB_WORKSPACE/core/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" \
$CMAKE_ARGS $CMAKE_ARGS
- name: Build - name: Build