From 60d2208f8819a8ff4f198b7758ae5e0d2e66986e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 1 Nov 2021 14:04:07 +0300 Subject: [PATCH] [Ubuntu] build vcpkg from specific commit (#4386) --- images/linux/scripts/installers/vcpkg.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 5d609fecd..3041600e5 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -5,15 +5,24 @@ ################################################################################ # Set env variable for vcpkg + +# Checkout the specific commit as master builds are falling. +# Upstream report: https://github.com/microsoft/vcpkg/issues/21107 +GIT_COMMIT_HASH=d78a0b47bdd4deb6bc5547e06e289672892ed226 VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT + +pushd $VCPKG_INSTALLATION_ROOT +git checkout $GIT_COMMIT_HASH +popd $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod 0777 -R $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +mkdir -p /usr/local/bin +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg -invoke_tests "Tools" "Vcpkg" \ No newline at end of file +invoke_tests "Tools" "Vcpkg"