echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'ci-vcvarsall-fix' into release-3.30

Browse Source 
c1ddff67f2 ci: use JSON to transfer environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9963
This commit is contained in:
Brad King 2024-11-01 09:09:02 -04:00
commit b7d5e6848d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab/ci/vcvarsall.ps1
View File

@ -1,9 +1,7 @@
$erroractionpreference = "stop" $erroractionpreference = "stop"
cmd /c "`"$env:VCVARSALL`" $env:VCVARSPLATFORM -vcvars_ver=$env:VCVARSVERSION & set" | $all_env = cmd /c "`"$env:VCVARSALL`" $env:VCVARSPLATFORM -vcvars_ver=$env:VCVARSVERSION >NUL & powershell -Command `"Get-ChildItem env: | Select-Object -Property Key,Value | ConvertTo-Json`"" | ConvertFrom-Json
foreach {
if ($_ -match "=") { foreach ($envvar in $all_env) {
$v = $_.split("=") [Environment]::SetEnvironmentVariable($envvar.Key, $envvar.Value)
[Environment]::SetEnvironmentVariable($v[0], $v[1])
}
} }