mirror of
https://github.com/actions/runner-images.git
synced 2025-12-30 22:07:58 +08:00
[Ubuntu] Remove Ubuntu16 related code from the VE repository (#4336)
This commit is contained in:
committed by
GitHub
parent
1f97f5de37
commit
2d46e3f4d9
@@ -4,9 +4,6 @@
|
||||
## Desc: Installs vcpkg
|
||||
################################################################################
|
||||
|
||||
# Source the helpers for use with the script
|
||||
source $HELPER_SCRIPTS/os.sh
|
||||
|
||||
# Set env variable for vcpkg
|
||||
VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg
|
||||
echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment
|
||||
@@ -14,19 +11,9 @@ echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environm
|
||||
# Install vcpkg
|
||||
git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT
|
||||
|
||||
# vcpkg requires g++ version 7+, yet Ubuntu 16 default is 5.4. Set version 7 as default temporarily
|
||||
if isUbuntu16; then
|
||||
ln -sf g++-7 /usr/bin/g++
|
||||
fi
|
||||
|
||||
$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
|
||||
|
||||
# Set back g++ 5.4 as default
|
||||
if isUbuntu16; then
|
||||
ln -sf g++-5 /usr/bin/g++
|
||||
fi
|
||||
|
||||
invoke_tests "Tools" "Vcpkg"
|
||||
Reference in New Issue
Block a user