Skip to content

Commit b253ec7

Browse files
committed
Update vcpkg in ci-msvc to specific version that fixes cmake 4 problems only if it is out of date
1 parent 148a118 commit b253ec7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci-msvc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
run: |
107107
cd $Env:VCPKG_INSTALLATION_ROOT
108108
git fetch
109-
git pull
109+
git merge --ff-only db1ddd0
110110
.\bootstrap-vcpkg.bat
111111
vcpkg integrate install
112112
@@ -141,7 +141,7 @@ jobs:
141141
run: |
142142
cd $Env:VCPKG_INSTALLATION_ROOT
143143
git fetch
144-
git pull
144+
git merge --ff-only db1ddd0
145145
.\bootstrap-vcpkg.bat
146146
vcpkg integrate install
147147

0 commit comments

Comments
 (0)