diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml index 3b7a2465fadc0..c955d849e41f7 100644 --- a/.github/workflows/msvc-full-features.yml +++ b/.github/workflows/msvc-full-features.yml @@ -71,21 +71,15 @@ jobs: echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" shell: cmd - - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@v10 + - name: Install stable CMake + uses: lukka/get-cmake@latest + + - name: Install vcpkg + uses: lukka/run-vcpkg@v11 id: runvcpkg with: - # run-vcpkg tries to hash vcpkg.json but complans if it finds more than one. - # That said, we also have our custom vcpkg_triplets to hash, so we keep everything the same. - appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', 'msvc-object_creator/vcpkg.json', '.github/vcpkg_triplets/**', '.github/vckg_ports/**' ) }} - # Rev this value to drop cache without changing vcpkg commit - prependedCacheKey: v1-x64-full vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - # We have to use at least this version of vcpkg to include fixes for yasm-tool's - # availability only as an x86 host tool. Keep it in sync with the builtin-baseline - # field in vcpkg.json. Caching happens as a post-action which runs at the end of - # the whole workflow, after vcpkg install happens during msbuild run. - vcpkgGitCommitId: 'd08e708c2111893da3cc7e49b597ee4654c8076e' + vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c' - name: Integrate vcpkg run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df47ba72963bc..c051db91798ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -190,23 +190,19 @@ jobs: run: | git clone --depth=1 --shallow-submodules --recurse-submodules https://github.com/Fris0uman/CDDA-Soundpacks '${{ github.workspace }}/CDDA-Soundpacks' mv '${{ github.workspace }}/CDDA-Soundpacks/sound/CC-Sounds' '${{ github.workspace }}/data/sound' + - name: Install dependencies (windows msvc) (0/3) + if: runner.os == 'Windows' + uses: lukka/get-cmake@latest - name: Install dependencies (windows msvc) (1/3) if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v1.0.2 - name: Install dependencies (windows msvc) (2/3) if: runner.os == 'Windows' - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@v11 id: runvcpkg with: - appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**', '.github/vckg_ports/**' ) }} - # Rev this value to drop cache without changing vcpkg commit - prependedCacheKey: v1-${{ matrix.arch }} vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - # We have to use at least this version of vcpkg to include fixes for yasm-tool's - # availability only as an x86 host tool. Keep it in sync with the builtin-baseline - # field in vcpkg.json. Caching happens as a post-action which runs at the end of - # the whole workflow, after vcpkg install happens during msbuild run. - vcpkgGitCommitId: 'd08e708c2111893da3cc7e49b597ee4654c8076e' + vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c' - name: Install dependencies (windows msvc) (3/3) if: runner.os == 'Windows' run: | diff --git a/doc/COMPILING/COMPILING-VS-VCPKG.md b/doc/COMPILING/COMPILING-VS-VCPKG.md index bb38151cb283e..691ded6b7d9ef 100644 --- a/doc/COMPILING/COMPILING-VS-VCPKG.md +++ b/doc/COMPILING/COMPILING-VS-VCPKG.md @@ -23,7 +23,7 @@ Steps from current guide were tested on Windows 10 (64 bit), Visual Studio 2019 2. Install `Git for Windows` (installer can be downloaded from [Git homepage](https://git-scm.com/)). -3. Install and configure `vcpkg`. If you already have `vcpkg` installed, you should update it to at least commit `d08e708c2111893da3cc7e49b597ee4654c8076e` (the most recent tested good revision) and rerun `.\bootstrap-vcpkg.bat` as described: +3. Install and configure `vcpkg`. If you already have `vcpkg` installed, you should update it to at least commit `5b1214315250939257ef5d62ecdcbca18cf4fb1c` (the most recent tested good revision) and rerun `.\bootstrap-vcpkg.bat` as described: ***WARNING: It is important that, wherever you decide to clone this repo, the path does not include whitespace. That is, `C:/dev/vcpkg` is acceptable, but `C:/dev test/vcpkg` is not.*** diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json index e8cbdab948ba8..a83d151f2ae61 100644 --- a/msvc-full-features/vcpkg.json +++ b/msvc-full-features/vcpkg.json @@ -9,7 +9,7 @@ }, { "name": "sdl2-mixer", - "features": [ "libflac", "mpg123", "libmodplug", "libvorbis" ] + "features": [ "libflac", "mpg123", "libmodplug" ] }, "sdl2-ttf" ], diff --git a/msvc-object_creator/vcpkg.json b/msvc-object_creator/vcpkg.json index 34e7043d8c9c4..82a7748593473 100644 --- a/msvc-object_creator/vcpkg.json +++ b/msvc-object_creator/vcpkg.json @@ -6,7 +6,7 @@ "sdl2-image", { "name": "sdl2-mixer", - "features": [ "libflac", "mpg123", "libmodplug", "libvorbis" ] + "features": [ "libflac", "mpg123", "libmodplug" ] }, "sdl2-ttf", "qt5-base"