Skip to content

Commit 27157c0

Browse files
authored
Merge pull request EmbeddedSynth#23 from pedrolcl/use-vcpkg-for-dependencies-in-msvc-ci
Use vcpkg in MSVC CI builds
2 parents a6c1b7b + 89c8e2f commit 27157c0

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

.github/workflows/win-msvc.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,23 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
include:
21-
- { icon: '🟪', arch: "win64", os: "windows-latest" }
22-
- { icon: '🟫', arch: "win32", os: "windows-latest" }
23-
- { icon: '🟩', arch: "arm64", os: "windows-11-arm" }
21+
- { icon: '🟪', arch: "win64", os: "windows-latest", triplet: "x64-windows" }
22+
- { icon: '🟫', arch: "win32", os: "windows-latest", triplet: "x86-windows" }
23+
- { icon: '🟩', arch: "arm64", os: "windows-11-arm", triplet: "arm64-windows" }
2424
runs-on: ${{ matrix.os }}
2525
name: 🚧${{ matrix.icon }} msvc ${{ matrix.arch }}
2626

2727
steps:
2828
- uses: actions/checkout@v6
2929

30+
- name: '${{ matrix.icon }} Build vcpkg'
31+
uses: johnwason/vcpkg-action@v7
32+
id: vcpkg
33+
with:
34+
pkgs: gtest zlib
35+
triplet: ${{ matrix.triplet }}
36+
token: ${{ github.token }}
37+
3038
- name: '${{ matrix.icon }} Install NSIS'
3139
uses: repolevedavaj/install-nsis@v1.1.0
3240
with:
@@ -49,13 +57,15 @@ jobs:
4957
enable-cross-os-archive: true
5058

5159
- name: '${{ matrix.icon }} Configure CMake'
60+
id: configuration
5261
run: >
53-
cmake -G Ninja -B ${{github.workspace}}/build
62+
cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }}
63+
-G Ninja -B ${{github.workspace}}/build
5464
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
5565
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}}
5666
-DCPACK_SYSTEM_NAME=${{matrix.arch}}
67+
-DDEPENDENCY_DIRS=${{github.workspace}}/vcpkg/installed/${{matrix.triplet}}/bin
5768
-DINSTALL_DEPENDENCIES=ON
58-
id: configuration
5969
6070
- name: '${{ matrix.icon }} Build'
6171
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)