From 6499c4089cffb4cc9ea123142fa7af5ba0344b8e 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: test fix --- .github/workflows/build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2342c27c7..f8282ba5a4 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 + update_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' }} @@ -216,7 +224,7 @@ jobs: run: | cd dependencies/vcpkg git fetch --unshallow - + - name: Setup release mode parameters (for deploy) if: ${{ inputs.deploymode == 'release' }} run: |