fix: MSVC build broke because packages aged out of mirrors

Remove the package list pin on vcpkg - no other platform is pinning package versions, and this removes the need for people to remember to update the commit id every year. Signed-off-by: David Li <[email protected]>
cataclysmbnteam · Jan 9, 2025 · bcb58ba · bcb58ba
1 parent 8c88415
commit bcb58ba
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/.github/workflows/manual-release.yml b/.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: |

diff --git a/.github/workflows/msvc-full-features-cmake.yml b/.github/workflows/msvc-full-features-cmake.yml
@@ -75,11 +75,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
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -229,7 +229,6 @@ jobs:
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-          vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
 
       - name: Integrate vcpkg
         if: runner.os == 'Windows'

diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json
@@ -13,7 +13,6 @@
         },
         "sdl2-ttf"
     ],
-    "builtin-baseline": "c9aba300923c8ec0ab190e2bff23085209925c97",
     "vcpkg-configuration": {
         "overlay-ports": [
             "../.github/vcpkg_ports"