build: fix packages aged out of mirrors breaking MSVC build

.github/workflows/manual-release.yml

@@ -202,11 +202,6 @@ jobs:
           appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
           setupOnly: true
           vcpkgDirectory: "${{ runner.workspace }}/b/vcpkg"
-          # We have to use at least this version of vcpkg to include fixes for
-          # various issues we've encountered over time. 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: "66444e13a86da7087ee24c342f91801cc6eb9877"
       - name: Install dependencies (windows msvc) (3/3)
         if: runner.os == 'Windows'
         run: |

.github/workflows/msvc-full-features-cmake.yml → .github/workflows/msvc-full-features.yml

@@ -1,4 +1,4 @@
-name: Cataclysm Windows build (CMake + MSVC)
+name: Cataclysm Windows build (MSVC)
 
 on:
   push:
@@ -34,7 +34,7 @@ on:
 
 # We only care about the latest revision, so cancel previous instances.
 concurrency:
-  group: msvc-cmake-build-${{ github.ref_name }}
+  group: msvc-build-${{ github.ref_name }}
   cancel-in-progress: true
 
 env:
@@ -43,7 +43,6 @@ env:
   # Have to use github.workspace because runner namespace isn't available yet.
   VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}\.github\vcpkg_triplets
   ZSTD_CLEVEL: 17
-  CMAKE_PRESET: windows-tiles-sounds-x64-msvc
 
 jobs:
   build_catatclysm:
@@ -71,41 +70,30 @@ jobs:
         echo =========================
         echo $env:PATH
 
-    - name: Install stable CMake
-      uses: lukka/get-cmake@latest
+    - name: Setup msys2 (windows msvc)
+      if: runner.os == 'Windows'
+      uses: msys2/setup-msys2@v2
+      with: { msystem: mingw64, install: gettext }
+
+    - name: Compile translations (windows msvc)
+      shell: msys2 {0}
+      run: lang/compile_mo.sh all
 
     - name: Install vcpkg
-      uses: lukka/run-vcpkg@v11
+      uses: lukka/run-vcpkg@main
       id: runvcpkg
       with:
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-        vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
 
     - name: Integrate vcpkg
       run: |
         vcpkg integrate install
 
-    - uses: ammaraskar/msvc-problem-matcher@master
-    - name: Configure
-      run: |
-          cmake -DTESTS=ON --preset $env:CMAKE_PRESET
-
     - uses: ammaraskar/msvc-problem-matcher@master
     - name: Build
       run: |
-          cmake --build out/build/$env:CMAKE_PRESET --config RelWithDebInfo
-
-    - name: Dump logs if build failed
-      if: failure()
-      run: |
-        echo =================================================
-        Get-ChildItem "${{ runner.workspace }}/Cataclysm-BN/out/build/$env:CMAKE_PRESET" -Recurse
-        echo =================================================
-
-    - name: Compile .mo files for localization
-      run: |
-          cmake --build out/build/$env:CMAKE_PRESET --target translations_compile --config RelWithDebInfo
+        msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;JsonFormatter-vcpkg-static;Cataclysm-test-vcpkg-static" msvc-full-features\Cataclysm-vcpkg-static.sln
 
     - name: Run tests
       run: |
-          .\RelWithDebInfo\cata_test-tiles.exe --rng-seed time
+        .\Cataclysm-test-vcpkg-static-Release-x64.exe --rng-seed time

.github/workflows/release.yml

@@ -225,11 +225,10 @@ jobs:
         uses: lukka/get-cmake@latest
 
       - name: Install vcpkg
-        uses: lukka/run-vcpkg@v11
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-          vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
 
       - name: Integrate vcpkg
         if: runner.os == 'Windows'

msvc-full-features/vcpkg.json

@@ -13,7 +13,7 @@
         },
         "sdl2-ttf"
     ],
-    "builtin-baseline": "c9aba300923c8ec0ab190e2bff23085209925c97",
+    "builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
     "vcpkg-configuration": {
         "overlay-ports": [
             "../.github/vcpkg_ports"