Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #5127 from talregev/TalR/fix_upfate_vcpkg_wasm_vcpkg_link 

[ci] Fix: vcpkg will clone from $VCPKG_LINK
This commit is contained in:
Vitalii Koshura 2023-03-15 09:23:16 +01:00 committed by GitHub
parent 66bae9a2fa 924b85c1a8
commit 5948920c35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/bootstrap_vcpkg_cmake.sh
View File

@ -8,12 +8,13 @@ if [ ! -d "$PLATFORM_NAME" ]; then
exit 1 exit 1
fi fi
. $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh
BUILD_DIR="$PWD/3rdParty/$PLATFORM_NAME" BUILD_DIR="$PWD/3rdParty/$PLATFORM_NAME"
VCPKG_ROOT="$BUILD_DIR/vcpkg" VCPKG_ROOT="$BUILD_DIR/vcpkg"
if [ ! -d $VCPKG_ROOT ]; then if [ ! -d $VCPKG_ROOT ]; then
mkdir -p $BUILD_DIR mkdir -p $BUILD_DIR
git -C $BUILD_DIR clone https://github.com/microsoft/vcpkg git -C $BUILD_DIR clone $VCPKG_LINK
fi fi
git -C $VCPKG_ROOT pull git -C $VCPKG_ROOT pull

4
wasm/update_emsdk_vcpkg.sh
View File

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