Skip to content

Commit 1385aab

Browse files
[fixing]
1 parent 7af5c51 commit 1385aab

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,6 @@ jobs:
106106
shell: pwsh
107107
# 17.* select VS 2022
108108
run: |
109+
echo "PowerShell version info:"
110+
echo $PSVersionTable
109111
tools/ci.ps1 -VSVersion 17.* -TargetArch "${{matrix.arch}}" -UseVcpkg

tools/ci.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Write-Verbose "Loading uv environment..."
3131
$uv_env = Get-UvEnvironment -ArgumentList "--group=build"
3232
Write-Verbose "Loading MSVS environment..."
3333
[hashtable]$uv_vs_env = Invoke-WithEnvironment $uv_env {
34-
Get-VsEnvironment -Version:$VSVersion -TargetArch:$TargetArch
34+
return Get-VsEnvironment -Version:$VSVersion -TargetArch:$TargetArch
3535
}
3636
# Set the CC and CXX env vars to point to MSVC to prevent Ninja generation from
3737
# attempting to use MinGW GCC instead, even if its available on the path

tools/util.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function Invoke-WithEnvironment {
164164
# Update the env and invoke the subcommand
165165
try {
166166
Update-CurrentEnvironment -Environment:$Environment -RemoveUnset:$RemoveUnset
167-
Invoke-Command $Command
167+
return (Invoke-Command $Command)
168168
}
169169
finally {
170170
Update-CurrentEnvironment $prior_env -RemoveUnset

0 commit comments

Comments
 (0)