wip

conan-io · Nov 27, 2024 · dd8a540 · dd8a540
1 parent a697344
commit dd8a540
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
@@ -36,30 +36,23 @@ jobs:
 
       - name: Install Visual Studio Build Tools
         run: |
-            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools.exe"
-            Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList `
+            Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "vs_buildtools15.exe"
+            Start-Process -FilePath ".\vs_buildtools15.exe" -ArgumentList `
             "--quiet",  "--wait", "--norestart", "--nocache", `
             "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
             "--add", "Microsoft.VisualStudio.Component.Windows81SDK", `
             "--add", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core", `
             "--add", "Microsoft.Component.MSBuild", `
-            "--add", "Microsoft.VisualStudio.Component.VC.140" -Wait
+            "--add", "Microsoft.VisualStudio.Component.VC.140" -WindowStyle Hidden -Wait
 
       - name: Install additional Visual Studio components
         run: |
-            $installer = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe"
-            if (!(Test-Path $installer)) {
-            Write-Host "Visual Studio Installer not found at $installer"
-            exit 1
-            }
-            Start-Process -FilePath $installer -ArgumentList `
-            "modify", `
-            "--installPath", "C:\Program Files\Microsoft Visual Studio\2022\Enterprise", `
-            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
-            "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-            "--add", "Microsoft.Component.MSBuild", `
+            Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vs_buildtools.exe" -OutFile "vs_buildtools17.exe"
+            Start-Process -FilePath ".\vs_buildtools17.exe" -ArgumentList `
             "--quiet", "--wait", "--norestart", "--nocache" `
-            -Wait
+            "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", `
+            "--add", "Microsoft.VisualStudio.Component.VC.v143.x86.x64" -WindowStyle Hidden -Wait
+
 
       - name: Cache pip packages
         uses: actions/cache@v4