diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e9698c93b..979ab0144 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,9 +71,7 @@ jobs: name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} runs-on: windows-2019 env: - VCPKG_VERSION: d5ec528843d29e3a52d745a64b469f810b2cedbf - # 2025.02.14 - vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp sdl2 + VCPKG_DEFAULT_TRIPLET: ${{matrix.config.vcpkg_triplet}} strategy: fail-fast: false matrix: @@ -97,13 +95,9 @@ jobs: - uses: actions/checkout@v4 - name: Restore from cache and run vcpkg - uses: lukka/run-vcpkg@v7 + uses: lukka/run-vcpkg@v11 with: - vcpkgArguments: ${{env.vcpkg_packages}} vcpkgDirectory: '${{ github.workspace }}\vcpkg' - appendedCacheKey: ${{ matrix.config.vcpkg_triplet }} - vcpkgGitCommitId: ${{ env.VCPKG_VERSION }} - vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }} - name: CMake # Note: See #15976 for why CMAKE_POLICY_VERSION_MINIMUM=3.5 is set. diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 000000000..213f4514a --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,29 @@ +{ + "builtin-baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf", + "dependencies": [ + "zlib", + "zstd", + { + "name": "curl", + "features": [ + "winssl" + ] + }, + "openal-soft", + "libvorbis", + "libogg", + "libjpeg-turbo", + "sqlite3", + "freetype", + "luajit", + "gmp", + "jsoncpp", + { + "name": "gettext", + "features": [ + "tools" + ] + }, + "sdl2" + ] +}