From 19c48b64ed40472dd361ffa855d44b61ff40a2b2 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Fri, 15 Mar 2024 20:27:33 +0100 Subject: [PATCH] ga: try fixing Windows build switch to latest lukka/run-vcpkg, use vcpkg.json file. --- .github/workflows/build.yml | 10 +++++----- vcpkg.json | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79030522..3a1c3a69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,14 +27,14 @@ jobs: if: ${{ runner.os == 'Linux' }} run: | sudo apt-get install libzstd-dev + - name: install latest CMake and Ninja for lukka/run-vcpkg (Windows) + if: ${{ runner.os == 'Windows' }} + uses: lukka/get-cmake@latest - name: install dependencies (Windows) if: ${{ runner.os == 'Windows' }} - uses: lukka/run-vcpkg@v7 - id: runvcpkg + uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: f93ba152d55e1d243160e690bc302ffe8638358e - vcpkgTriplet: x64-windows - vcpkgArguments: zlib bzip2 liblzma zstd + vcpkgGitCommitId: 2cf957350da28ad032178a974607f59f961217d9 - name: prepare build directory and install nihtest run: | cmake -E make_directory ${{runner.workspace}}/build diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000..b3116e10 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,8 @@ +{ + "dependencies": [ + "bzip2", + "liblzma", + "zlib", + "zstd" + ] +}