actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert VCPKG_ROOT variable (#6458)

Browse Source
This commit is contained in:
Erik Bershel
2022-10-25 09:30:50 +02:00
committed by GitHub
parent b284ec81a5
commit a9611d8e7f
7 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,5 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install"
Add-MachinePathItem $InstallDir
$env:Path = Get-MachinePath
setx VCPKG_INSTALLATION_ROOT $InstallDir /M
setx VCPKG_ROOT $InstallDir /M
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"
"Value" = $env:VCPKG_INSTALLATION_ROOT
},
@{
"Name" = "VCPKG_ROOT"
"Value" = $env:VCPKG_ROOT
}
)
if (Test-IsWin19) {

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

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