From 7ade0d133fe8cd8dc92c05099f7b3ab6a2e95aa4 Mon Sep 17 00:00:00 2001
From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com>
Date: Tue, 28 May 2024 21:24:38 +0200
Subject: [PATCH] CI: fix build without changing dependency versions this is
 really ugly but it works...

---
 .github/workflows/build.yml | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2342c27c7..8c873e033a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,6 +28,14 @@ jobs:
       run: |
         cd dependencies/vcpkg
         git fetch --unshallow
+        git checkout cbf4a664
+        git fetch origin pull/38979/head
+        git config --global user.name "GitHub Runner fixup action script"
+        git config --global user.email "not-a-real-email@example.com"
+        git cherry-pick -Xtheirs 855a293b 951af818
+        updated_commit=`git rev-parse HEAD`
+        cd $GITHUB_WORKSPACE
+        sed -i "s/cbf4a6641528cee6f172328984576f51698de726/$updated_commit/g" vcpkg.json
 
     - name: Setup release mode parameters (for deploy)
       if: ${{ inputs.deploymode == 'release' }}
@@ -137,7 +145,15 @@ jobs:
       run: |
         cd dependencies/vcpkg
         git fetch --unshallow
-        
+        git checkout cbf4a664
+        git fetch origin pull/38979/head
+        git config --global user.name "GitHub Runner fixup action script"
+        git config --global user.email "not-a-real-email@example.com"
+        git cherry-pick -Xtheirs 855a293b 951af818
+        $updated_commit = git rev-parse HEAD
+        cd $GITHUB_WORKSPACE
+        sed -i "s/cbf4a6641528cee6f172328984576f51698de726/$updated_commit/g" vcpkg.json
+
     - name: Setup release mode parameters (for deploy)
       if: ${{ inputs.deploymode == 'release' }}
       run: |
@@ -216,7 +232,15 @@ jobs:
       run: |
         cd dependencies/vcpkg
         git fetch --unshallow
-        
+        git checkout cbf4a664
+        git fetch origin pull/38979/head
+        git config --global user.name "GitHub Runner fixup action script"
+        git config --global user.email "not-a-real-email@example.com"
+        git cherry-pick -Xtheirs 855a293b 951af818
+        updated_commit=`git rev-parse HEAD`
+        cd $GITHUB_WORKSPACE
+        sed -i "s/cbf4a6641528cee6f172328984576f51698de726/$updated_commit/g" vcpkg.json
+
     - name: Setup release mode parameters (for deploy)
       if: ${{ inputs.deploymode == 'release' }}
       run: |