From 274a1dac7caced7d83340ffdb4d026c94e7b0f2c Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Mon, 17 Jun 2024 22:30:26 +0200 Subject: [PATCH] fix workflows vcpkg version --- .github/workflows/cmake-linux.yml | 8 ++++++++ .github/workflows/cmake-windows.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-linux.yml b/.github/workflows/cmake-linux.yml index b510f48..67be008 100644 --- a/.github/workflows/cmake-linux.yml +++ b/.github/workflows/cmake-linux.yml @@ -13,6 +13,14 @@ jobs: - uses: actions/checkout@v2 with: submodules: 'true' + + - name: Restore artifacts, or run vcpkg, build and cache artifacts + uses: lukka/run-vcpkg@v7 + id: runvcpkg + with: + vcpkgArguments: 'zlib nlohmann-json openssl cpp-httplib[openssl]' + vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' + vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6' - name: Create Build Environment run: cmake -E make_directory ${{github.workspace}}/build-linux diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index fc22bb4..63153d8 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -20,7 +20,7 @@ jobs: with: vcpkgArguments: 'discord-rpc zlib nlohmann-json openssl cpp-httplib[openssl]' vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4' + vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6' vcpkgTriplet: 'x64-windows-static' - name: Create Build Environment