Skip to content

Commit 7e5d0af

Browse files
committed
fix: improve Visual Studio Build Tools installation process in Windows CUDA workflow
1 parent 8c5eea5 commit 7e5d0af

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

.github/workflows/build-extended-artifacts.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,24 @@ jobs:
102102
shell: pwsh
103103
run: |
104104
choco install visualstudio2022buildtools --no-progress -y --installargs '--add Microsoft.VisualStudio.Workload.VCTools --quiet --norestart'
105-
& "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\BuildTools" --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --passive --norestart
106-
$clRoot = "C:\Program Files\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC"
105+
$vsInstaller = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe"
106+
if (Test-Path $vsInstaller) {
107+
Start-Process -FilePath $vsInstaller -ArgumentList @(
108+
'modify',
109+
'--installPath', 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools',
110+
'--add', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
111+
'--quiet', '--norestart'
112+
) -Wait
113+
}
114+
$vsInstallRoot = "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools"
115+
if (-not (Test-Path $vsInstallRoot)) {
116+
$vsInstallRoot = "C:\Program Files\Microsoft Visual Studio\2022\BuildTools"
117+
}
118+
$clRoot = Join-Path $vsInstallRoot 'VC\Tools\MSVC'
107119
if (-not (Test-Path $clRoot)) { throw "MSVC toolchain not found after installation" }
108120
$vcVersion = Get-ChildItem $clRoot | Sort-Object Name -Descending | Select-Object -First 1
109121
if (-not $vcVersion) { throw "Unable to locate installed MSVC version" }
110-
$binDir = Join-Path $vcVersion.FullName "bin\Hostx64\x64"
122+
$binDir = Join-Path $vcVersion.FullName 'bin\Hostx64\x64'
111123
Add-Content $env:GITHUB_PATH $binDir
112124
Add-Content $env:GITHUB_ENV "VCToolsInstallDir=$($vcVersion.FullName)"
113125

0 commit comments

Comments
 (0)