Improved workaround for breaking vcpkg changes (#496)

G-Research · Jan 21, 2025 · 6a0bea7 · 6a0bea7
1 parent fa68710
commit 6a0bea7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,9 +96,19 @@ jobs:
       run: |
         git reset --hard
         git pull
-        # Workaround for breaking changes ("Migrate tool metadata from XML to JSON format")
-        git checkout 358f3893843c9d0d1b2e594183481fb68e3aa963~1
-        git status
+
+    # We may need to re-bootstrap vcpkg after updating
+    - name: Bootstrap vcpkg (Unix)
+      if: runner.os != 'Windows'
+      working-directory: ${{ steps.vcpkg-info.outputs.root }}
+      run: |
+        ./bootstrap-vcpkg.sh
+
+    - name: Bootstrap vcpkg (Windows)
+      if: runner.os == 'Windows'
+      working-directory: ${{ steps.vcpkg-info.outputs.root }}
+      run: |
+        ./bootstrap-vcpkg.bat
 
     # Setup a CentOS 7 container to build on Linux x64 for backwards compatibility.
     - name: Start CentOS container and install toolchain

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -28,9 +28,11 @@ jobs:
         cd $VCPKG_INSTALLATION_ROOT
         git reset --hard
         git pull
-        # Workaround for breaking changes ("Migrate tool metadata from XML to JSON format")
-        git checkout 358f3893843c9d0d1b2e594183481fb68e3aa963~1
-        git status
+
+    - name: Bootstrap vcpkg
+      run: |
+        cd $VCPKG_INSTALLATION_ROOT
+        ./bootstrap-vcpkg.sh
 
     - name: Setup .NET SDK v8.0.x
       uses: actions/setup-dotnet@v4