actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert VCPKG_ROOT variable (#6449)

Browse Source
This commit is contained in:
Erik Bershel
2022-10-24 11:10:20 +02:00
committed by GitHub
parent c2112cbe40
commit 88d253f383
7 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -429,10 +429,6 @@ 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] @{

17
images/linux/scripts/installers/vcpkg.sh
View File

@@ -4,17 +4,16 @@
## Desc: Installs vcpkg ## Desc: Installs vcpkg
################################################################################ ################################################################################
# Set env variables for vcpkg # Set env variable for vcpkg
VCPKG_ROOT=/usr/local/share/vcpkg VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg
echo "VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment
echo "VCPKG_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment
# Install vcpkg # Install vcpkg
git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT
$VCPKG_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg integrate install $VCPKG_INSTALLATION_ROOT/vcpkg integrate install
chmod 0777 -R $VCPKG_ROOT chmod 0777 -R $VCPKG_INSTALLATION_ROOT
ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin
invoke_tests "Tools" "Vcpkg" invoke_tests "Tools" "Vcpkg"

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

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

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

@@ -562,10 +562,6 @@ 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] @{

1
images/win/scripts/Installers/Install-Vcpkg.ps1
View File

@@ -17,6 +17,5 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install"
Add-MachinePathItem $InstallDir Add-MachinePathItem $InstallDir
$env:Path = Get-MachinePath $env:Path = Get-MachinePath
setx VCPKG_INSTALLATION_ROOT $InstallDir /M setx VCPKG_INSTALLATION_ROOT $InstallDir /M
setx VCPKG_ROOT $InstallDir /M
Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg"

4
images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -347,10 +347,6 @@ 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
} }
) )
if (Test-IsWin19) { if (Test-IsWin19) {

8
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -153,13 +153,9 @@ Describe "Vcpkg" {
It "env variable VCPKG_INSTALLATION_ROOT is set" { It "env variable VCPKG_INSTALLATION_ROOT is set" {
$env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty $env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty
} }
It "env variable VCPKG_ROOT is set" {
$env:VCPKG_ROOT | Should -Not -BeNullOrEmpty
}
It "VCPKG_ROOT directory" { It "VCPKG_INSTALLATION_ROOT directory" {
$env:VCPKG_ROOT | Should -Exist $env:VCPKG_INSTALLATION_ROOT | Should -Exist
} }
} }