From bbade5d3bc11946e822b2303d995a0e057f23097 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sun, 10 Aug 2025 17:44:04 +0200 Subject: [PATCH] Bump CI runners windows-2019 to windows-2025 --- .github/workflows/windows.yml | 8 ++++---- doc/compiling/windows.md | 4 ++-- vcpkg.json | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 979ab0144..740c6a382 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -68,8 +68,8 @@ jobs: if-no-files-found: error msvc: - name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} - runs-on: windows-2019 + name: VS 2022 ${{ matrix.config.arch }}-${{ matrix.type }} + runs-on: windows-2025 env: VCPKG_DEFAULT_TRIPLET: ${{matrix.config.vcpkg_triplet}} strategy: @@ -78,12 +78,12 @@ jobs: config: - { arch: x86, - generator: "-G'Visual Studio 16 2019' -A Win32", + generator: "-G'Visual Studio 17 2022' -A Win32", vcpkg_triplet: x86-windows } - { arch: x64, - generator: "-G'Visual Studio 16 2019' -A x64", + generator: "-G'Visual Studio 17 2022' -A x64", vcpkg_triplet: x64-windows } type: [portable] diff --git a/doc/compiling/windows.md b/doc/compiling/windows.md index f61a8d677..7fa5ab617 100644 --- a/doc/compiling/windows.md +++ b/doc/compiling/windows.md @@ -14,10 +14,10 @@ It is highly recommended to use vcpkg as package manager. After you successfully built vcpkg you can easily install the required libraries: ```powershell -vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext[tools] sdl2 --triplet x64-windows +vcpkg install zlib zstd curl[ssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext[tools] sdl2 --triplet x64-windows ``` -- `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store. +- `curl` is optional, but required to read the serverlist, `curl[ssl]` is required to use the content store. - `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound. - `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter. - `gmp` and `jsoncpp` are optional, otherwise the bundled versions will be compiled diff --git a/vcpkg.json b/vcpkg.json index 47774356b..c099d34ca 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,10 +3,11 @@ "dependencies": [ "zlib", "zstd", + "openssl", { "name": "curl", "features": [ - "winssl" + "ssl" ] }, "openal-soft",