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

[Windows] Add VCPKG_ROOT variable (#6192)

Browse Source
This commit is contained in:
Erik Bershel
2022-09-08 17:29:02 +02:00
committed by GitHub
parent 27d6979ea5
commit a4b9a51304
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -147,15 +147,19 @@ Describe "Stack" {
Describe "Vcpkg" { Describe "Vcpkg" {
It "vcpkg" { It "vcpkg" {
"vcpkg version" | Should -ReturnZeroExitCode "vcpkg version" | Should -ReturnZeroExitCode
} }
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 "VCPKG_INSTALLATION_ROOT directory" { It "env variable VCPKG_ROOT is set" {
$env:VCPKG_INSTALLATION_ROOT | Should -Exist $env:VCPKG_ROOT | Should -Not -BeNullOrEmpty
}
It "VCPKG_ROOT directory" {
$env:VCPKG_ROOT | Should -Exist
} }
} }