From 89c8e2f784a6f926cd88fc40671b12986cab39d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20L=C3=B3pez-Cabanillas?= Date: Sat, 14 Feb 2026 09:22:17 +0100 Subject: [PATCH] Use vcpkg in MSVC CI builds --- .github/workflows/win-msvc.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index 4e39390..4895bcb 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -18,15 +18,23 @@ jobs: fail-fast: false matrix: include: - - { icon: '🟪', arch: "win64", os: "windows-latest" } - - { icon: '🟫', arch: "win32", os: "windows-latest" } - - { icon: '🟩', arch: "arm64", os: "windows-11-arm" } + - { icon: '🟪', arch: "win64", os: "windows-latest", triplet: "x64-windows" } + - { icon: '🟫', arch: "win32", os: "windows-latest", triplet: "x86-windows" } + - { icon: '🟩', arch: "arm64", os: "windows-11-arm", triplet: "arm64-windows" } runs-on: ${{ matrix.os }} name: 🚧${{ matrix.icon }} msvc ${{ matrix.arch }} steps: - uses: actions/checkout@v6 + - name: '${{ matrix.icon }} Build vcpkg' + uses: johnwason/vcpkg-action@v7 + id: vcpkg + with: + pkgs: gtest zlib + triplet: ${{ matrix.triplet }} + token: ${{ github.token }} + - name: '${{ matrix.icon }} Install NSIS' uses: repolevedavaj/install-nsis@v1.1.0 with: @@ -49,13 +57,15 @@ jobs: enable-cross-os-archive: true - name: '${{ matrix.icon }} Configure CMake' + id: configuration run: > - cmake -G Ninja -B ${{github.workspace}}/build + cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} + -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -DCPACK_SYSTEM_NAME=${{matrix.arch}} + -DDEPENDENCY_DIRS=${{github.workspace}}/vcpkg/installed/${{matrix.triplet}}/bin -DINSTALL_DEPENDENCIES=ON - id: configuration - name: '${{ matrix.icon }} Build' run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}