CI - try latest stable vcpkg rather than master

samaaron · samaaron · commit 29019e51823c · 2024-04-23T12:38:25.000+01:00
diff --git a/app/linux-pre-vcpkg.sh b/app/linux-pre-vcpkg.sh
@@ -30,8 +30,7 @@ cd "${SCRIPT_DIR}"
 # Build vcpkg
 if [ ! -d "vcpkg" ]; then
     echo "Cloning vcpkg"
-    # git clone --depth 1 --branch "${VCPKG_BRANCH:-2024.03.25}" https://github.com/microsoft/vcpkg.git vcpkg
-    git clone --depth 1 --branch master https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch "${VCPKG_BRANCH:-2024.03.25}" https://github.com/microsoft/vcpkg.git vcpkg
 fi
 
 export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"
diff --git a/app/mac-pre-vcpkg.sh b/app/mac-pre-vcpkg.sh
@@ -30,8 +30,7 @@ cd "${SCRIPT_DIR}"
 # Build vcpkg
 if [ ! -d "vcpkg" ]; then
     echo "Cloning vcpkg"
-    # git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg
-    git clone --depth 1 --branch master https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg
 fi
 
 export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"
diff --git a/app/win-pre-vcpkg.bat b/app/win-pre-vcpkg.bat
@@ -5,8 +5,7 @@ cd %~dp0
 REM Build vcpkg
 if not exist "vcpkg\" (
     echo Cloning vcpkg
-    @REM git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg
-    git clone --depth 1 --branch master https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg
 )
 
 set VCPKG_ROOT=%~dp0/vcpkg

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ cd %~dp0`
`5`	`5`	`REM Build vcpkg`
`6`	`6`	`if not exist "vcpkg\" (`
`7`	`7`	`echo Cloning vcpkg`
`8`		`- @REM git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg`
`9`		`- git clone --depth 1 --branch master https://github.com/microsoft/vcpkg.git vcpkg`
	`8`	`+ git clone --depth 1 --branch 2024.03.25 https://github.com/microsoft/vcpkg.git vcpkg`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`set VCPKG_ROOT=%~dp0/vcpkg`