From 8fd74ebe0f0706cb6aa2cc01f5863961d01173e9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 8 Nov 2021 16:52:37 +0300 Subject: [PATCH] Revert "[macOS] install vcpkg from specific commit (#4389)" (#4439) This reverts commit 706a7ae6d398dc8937bef79272d819808afd2145. --- images/macos/provision/core/vcpkg.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index 188ed418..d20cb3ca 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -2,24 +2,14 @@ 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 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT - -pushd $VCPKG_INSTALLATION_ROOT -git checkout $GIT_COMMIT_HASH -popd - +git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod -R 0777 $VCPKG_INSTALLATION_ROOT -mkdir -p /usr/local/bin -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin invoke_tests "Common" "vcpkg"