Merge pull request #5127 from talregev/TalR/fix_upfate_vcpkg_wasm_vcp…

…kg_link [ci] Fix: vcpkg will clone from $VCPKG_LINK
BOINC · Mar 15, 2023 · 5948920 · 5948920
2 parents 66bae9a + 924b85c
commit 5948920
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/android/bootstrap_vcpkg_cmake.sh b/android/bootstrap_vcpkg_cmake.sh
@@ -8,12 +8,13 @@ if [ ! -d "$PLATFORM_NAME" ]; then
     exit 1
 fi
 
+. $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh
 BUILD_DIR="$PWD/3rdParty/$PLATFORM_NAME"
 VCPKG_ROOT="$BUILD_DIR/vcpkg"
 
 if [ ! -d $VCPKG_ROOT ]; then
     mkdir -p $BUILD_DIR
-    git -C $BUILD_DIR clone https://github.com/microsoft/vcpkg
+    git -C $BUILD_DIR clone $VCPKG_LINK
 fi
 
 git -C $VCPKG_ROOT pull

diff --git a/wasm/update_emsdk_vcpkg.sh b/wasm/update_emsdk_vcpkg.sh
@@ -6,14 +6,14 @@ if [ ! -d "wasm" ]; then
     exit 1
 fi
 
-
+. $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh
 BUILD_DIR="$PWD/3rdParty/wasm"
 VCPKG_PORTS="$PWD/3rdParty/vcpkg_ports"
 VCPKG_ROOT="$BUILD_DIR/vcpkg"
 
 if [ ! -d $VCPKG_ROOT ]; then
     mkdir -p $BUILD_DIR
-    git -C $BUILD_DIR clone https://github.com/microsoft/vcpkg
+    git -C $BUILD_DIR clone $VCPKG_LINK
 fi
 
 git -C $VCPKG_ROOT pull