Skip to content

Commit

Permalink
ci: Switch to MSVC's installation of vcpkg
Browse files Browse the repository at this point in the history
This setup reflects a minimal build environment on Windows when both
CMake and vcpkg are vendored by MSVC.
Also, MSVC's installation of vcpkg might be a few months behind the
master branch.
  • Loading branch information
hebasto committed Oct 30, 2024
1 parent aa4b67d commit 5e1b4ed
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
- name: Using vcpkg with MSBuild
run: |
Set-Location "$env:VCPKG_INSTALLATION_ROOT"
Set-Location "$env:VCPKG_ROOT"
Add-Content -Path "triplets\x64-windows.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
Expand All @@ -184,11 +184,11 @@ jobs:
# While the vcpkg.json file includes packages with pinned versions,
# we need to maintain its "builtin-baseline" field.
run: |
& "$env:VCPKG_INSTALLATION_ROOT\vcpkg.exe" x-update-baseline --dry-run
& "$env:VCPKG_ROOT\vcpkg.exe" x-update-baseline --dry-run
- name: Generate build system
run: |
cmake -B build --preset vs2022-static -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DBUILD_GUI=ON -DWITH_BDB=ON -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWERROR=ON
cmake -B build --preset vs2022-static -DBUILD_GUI=ON -DWITH_BDB=ON -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWERROR=ON
- name: Save vcpkg binary cache
uses: actions/cache/save@v4
Expand Down

0 comments on commit 5e1b4ed

Please sign in to comment.