From c303368867edbb4fd8701601349b355a35bd9640 Mon Sep 17 00:00:00 2001
From: akrieger <akrieger@users.noreply.github.com>
Date: Thu, 6 Apr 2023 06:45:53 -0700
Subject: [PATCH] Update vcpkg configuration, again

---
 .github/workflows/msvc-full-features.yml | 15 ++++++---------
 .github/workflows/release.yml            | 22 ++++++++--------------
 msvc-full-features/vcpkg.json            |  2 +-
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
index 0e86dc543ca8..ef971269b40a 100644
--- a/.github/workflows/msvc-full-features.yml
+++ b/.github/workflows/msvc-full-features.yml
@@ -59,18 +59,15 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.3.1
 
-    - 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', '.github/vcpkg_triplets/**' ) }}-x64
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-        # Keep vcpkg version here 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: 'a7b6122f6b6504d16d96117336a0562693579933'
+        vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
 
     - name: Integrate vcpkg
       run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22617f98f62b..7bca400f7aa3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -170,24 +170,18 @@ jobs:
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
-      - name: Install dependencies (windows msvc) (1/3)
+      - name: Install MSBuild (windows msvc)
         if: runner.os == 'Windows'
         uses: microsoft/setup-msbuild@v1.3.1
-      - name: Install dependencies (windows msvc) (2/3)
-        if: runner.os == 'Windows'
-        uses: lukka/run-vcpkg@main
+      - name: Install stable CMake
+        uses: lukka/get-cmake@latest
+      - name: Install vcpkg
+        uses: lukka/run-vcpkg@v11
         id: runvcpkg
         with:
-          additionalCachedPaths: "${{ runner.workspace }}/Cataclysm-BN/msvc-full-features/vcpkg_installed"
-          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: "a7b6122f6b6504d16d96117336a0562693579933"
-      - name: Install dependencies (windows msvc) (3/3)
+          vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+          vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
+      - name: Integrate vcpkg
         if: runner.os == 'Windows'
         run: |
           vcpkg integrate install
diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json
index bc752e821e66..558eafe94d8c 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"
     ]