From 706a7ae6d398dc8937bef79272d819808afd2145 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 1 Nov 2021 18:35:29 +0300 Subject: [PATCH] [macOS] install vcpkg from specific commit (#4389) --- images/macos/provision/core/vcpkg.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index d20cb3ca4..188ed418c 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -2,14 +2,24 @@ source ~/utils/utils.sh # 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 "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc # 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 -R 0777 $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 "Common" "vcpkg"