From 8c40f70ee3ff0e467502cdf22d85f8fcc94d03d6 Mon Sep 17 00:00:00 2001 From: demianmnave Date: Tue, 19 Nov 2024 16:32:14 -0500 Subject: [PATCH] run-cmake needs vcpkg for MSVC env vars --- .github/workflows/msvc17.yml | 11 +++-------- vcpkg.json | 8 ++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/msvc17.yml b/.github/workflows/msvc17.yml index 948e5fe..440a1a9 100644 --- a/.github/workflows/msvc17.yml +++ b/.github/workflows/msvc17.yml @@ -8,15 +8,10 @@ jobs: name: MSVC Latest runs-on: windows-2022 steps: - - uses: lukka/get-cmake@latest - with: - cmakeVersion: "~3.29.0" - useCloudCache: true - - uses: actions/checkout@v4 - - - name: CMake configure-build-test - uses: lukka/run-cmake@v10 + - uses: lukka/get-cmake@v3.29 + - uses: lukka/run-vcpkg@v11 + - uses: lukka/run-cmake@v10 with: configurePreset: "cml-ci-ninja-msvc-mt-s" buildPreset: "cml-ci-ninja-msvc-mt-s-release" diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..2d9e4f1 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "$1": "Baseline vcpkg-root commit hash (2024.11.16) for Catch2 v3.7.1", + "builtin-baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c", + "dependencies": [ + "catch2" + ] +} \ No newline at end of file