From 8529b231c8b87ea8d8f7d6fb20eb7eb5eec7cd2f Mon Sep 17 00:00:00 2001 From: Oleksandr Kalko Date: Sun, 3 Dec 2023 16:18:19 +0200 Subject: [PATCH] Upgrade vcpkg commit --- .github/workflows/Windows_MSVC_x64.yml | 4 +- vcpkg.json | 70 +++++++++++++------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/Windows_MSVC_x64.yml b/.github/workflows/Windows_MSVC_x64.yml index 49e76d0fc..a287ef8fb 100644 --- a/.github/workflows/Windows_MSVC_x64.yml +++ b/.github/workflows/Windows_MSVC_x64.yml @@ -31,9 +31,9 @@ jobs: uses: lukka/get-cmake@latest - name: Restore or setup vcpkg - uses: lukka/run-vcpkg@v11.1 + uses: lukka/run-vcpkg@v11.3 with: - vcpkgGitCommitId: '927bc12e31148b0d44ae9d174b96c20e3bcf08eb' + vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4' - name: Fetch test data run: | diff --git a/vcpkg.json b/vcpkg.json index c6a6010da..c2f0ed522 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,37 +1,37 @@ { - "name": "devilutionx", - "version-string": "1.4.0", - "dependencies": [ - "fmt", - "bzip2", - "simpleini" - ], - "builtin-baseline": "927bc12e31148b0d44ae9d174b96c20e3bcf08eb", - "features": { - "sdl1": { - "description": "Use SDL1.2 instead of SDL2", - "dependencies": [ "sdl1", "libpng" ] - }, - "sdl2": { - "description": "Use SDL2", - "dependencies": [ "sdl2", "sdl2-image" ] - }, - "encryption": { - "description": "Build libsodium for packet encryption", - "dependencies": [ "libsodium" ] - }, - "translations": { - "description": "Build translation files", - "dependencies": [ - { - "name": "gettext", - "features": [ "tools" ] - } - ] - }, - "tests": { - "description": "Build tests", - "dependencies": [ "gtest" ] - } - } + "name": "devilutionx", + "version-string": "1.5.2", + "dependencies": [ + "fmt", + "bzip2", + "simpleini" + ], + "builtin-baseline": "16ee2ecb31788c336ace8bb14c21801efb6836e4", + "features": { + "sdl1": { + "description": "Use SDL1.2 instead of SDL2", + "dependencies": [ "sdl1", "libpng" ] + }, + "sdl2": { + "description": "Use SDL2", + "dependencies": [ "sdl2", "sdl2-image" ] + }, + "encryption": { + "description": "Build libsodium for packet encryption", + "dependencies": [ "libsodium" ] + }, + "translations": { + "description": "Build translation files", + "dependencies": [ + { + "name": "gettext", + "features": [ "tools" ] + } + ] + }, + "tests": { + "description": "Build tests", + "dependencies": [ "gtest" ] + } + } }