File tree Expand file tree Collapse file tree 3 files changed +4
-2
lines changed Expand file tree Collapse file tree 3 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -106,4 +106,6 @@ jobs:
106
106
shell : pwsh
107
107
# 17.* select VS 2022
108
108
run : |
109
+ echo "PowerShell version info:"
110
+ echo $PSVersionTable
109
111
tools/ci.ps1 -VSVersion 17.* -TargetArch "${{matrix.arch}}" -UseVcpkg
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ Write-Verbose "Loading uv environment..."
31
31
$uv_env = Get-UvEnvironment - ArgumentList " --group=build"
32
32
Write-Verbose " Loading MSVS environment..."
33
33
[hashtable ]$uv_vs_env = Invoke-WithEnvironment $uv_env {
34
- Get-VsEnvironment - Version:$VSVersion - TargetArch:$TargetArch
34
+ return Get-VsEnvironment - Version:$VSVersion - TargetArch:$TargetArch
35
35
}
36
36
# Set the CC and CXX env vars to point to MSVC to prevent Ninja generation from
37
37
# attempting to use MinGW GCC instead, even if its available on the path
Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ function Invoke-WithEnvironment {
164
164
# Update the env and invoke the subcommand
165
165
try {
166
166
Update-CurrentEnvironment - Environment:$Environment - RemoveUnset:$RemoveUnset
167
- Invoke-Command $Command
167
+ return ( Invoke-Command $Command )
168
168
}
169
169
finally {
170
170
Update-CurrentEnvironment $prior_env - RemoveUnset
You can’t perform that action at this time.
0 commit comments