actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-08 11:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[macOS] install vcpkg from specific commit (#4389)" (#4439)

Browse Source 
This reverts commit 706a7ae6d3.
This commit is contained in:
Mikhail Timofeev
2021-11-08 16:52:37 +03:00
committed by GitHub
parent 11464d5288
commit 8fd74ebe0f
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
images/macos/provision/core/vcpkg.sh
View File

@@ -2,24 +2,14 @@
source ~/utils/utils.sh source ~/utils/utils.sh
# Set env variable for vcpkg # 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 VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg
echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc
# Install vcpkg # Install vcpkg
git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT git clone --depth=1 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/bootstrap-vcpkg.sh
$VCPKG_INSTALLATION_ROOT/vcpkg integrate install $VCPKG_INSTALLATION_ROOT/vcpkg integrate install
chmod -R 0777 $VCPKG_INSTALLATION_ROOT chmod -R 0777 $VCPKG_INSTALLATION_ROOT
mkdir -p /usr/local/bin ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin
ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg
invoke_tests "Common" "vcpkg" invoke_tests "Common" "vcpkg"