actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-13 04:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add VCPKG_ROOT variable (#6195)

Browse Source
This commit is contained in:
Erik Bershel
2022-09-09 11:04:46 +02:00
committed by GitHub
parent 03c71fa649
commit 148eaf9c80
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,16 @@
#!/bin/bash -e -o pipefail #!/bin/bash -e -o pipefail
source ~/utils/utils.sh source ~/utils/utils.sh
# Set env variable for vcpkg # Set env variables for vcpkg
VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg VCPKG_ROOT=/usr/local/share/vcpkg
echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc
echo "export VCPKG_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc
# Install vcpkg # Install vcpkg
git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT
$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_INSTALLATION_ROOT/vcpkg integrate install $VCPKG_ROOT/vcpkg integrate install
chmod -R 0777 $VCPKG_INSTALLATION_ROOT chmod -R 0777 $VCPKG_ROOT
ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin
invoke_tests "Common" "vcpkg" invoke_tests "Common" "vcpkg"

4
images/macos/software-report/SoftwareReport.Common.psm1
View File

@@ -562,6 +562,10 @@ function Build-PackageManagementEnvironmentTable {
@{ @{
"Name" = "VCPKG_INSTALLATION_ROOT" "Name" = "VCPKG_INSTALLATION_ROOT"
"Value" = $env:VCPKG_INSTALLATION_ROOT "Value" = $env:VCPKG_INSTALLATION_ROOT
},
@{
"Name" = "VCPKG_ROOT"
"Value" = $env:VCPKG_ROOT
} }
) | ForEach-Object { ) | ForEach-Object {
[PSCustomObject] @{ [PSCustomObject] @{