Skip to content

Commit

Permalink
Revert "[macOS] install vcpkg from specific commit (#4389)" (#4439)
Browse files Browse the repository at this point in the history
This reverts commit 706a7ae.
  • Loading branch information
miketimofeev authored Nov 8, 2021
1 parent 11464d5 commit 8fd74eb
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions images/macos/provision/core/vcpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 8fd74eb

Please sign in to comment.