Skip to content

Commit 70100f8

Browse files
committed
Revert "ci: Avoid toolset ambiguity that MSVC can't handle"
This reverts commit 91d5bd8.
1 parent 1a889f7 commit 70100f8

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -138,55 +138,6 @@ jobs:
138138
- name: Checkout
139139
uses: actions/checkout@v4
140140

141-
- name: Fix Visual Studio installation
142-
# Avoid toolset ambiguity that MSVC can't handle.
143-
run: |
144-
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
145-
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
146-
$componentsToRemove= @(
147-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre"
148-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM"
149-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre"
150-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64"
151-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre"
152-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM"
153-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre"
154-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64"
155-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre"
156-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL"
157-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre"
158-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM"
159-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre"
160-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64"
161-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre"
162-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC"
163-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre"
164-
"Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64"
165-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM"
166-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre"
167-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64"
168-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre"
169-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL"
170-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM"
171-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre"
172-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64"
173-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre"
174-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre"
175-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC"
176-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM"
177-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre"
178-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64"
179-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre"
180-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre"
181-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64"
182-
"Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre"
183-
)
184-
[string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " + $_}
185-
$Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
186-
# should be run twice
187-
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
188-
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
189-
190141
- name: Configure Developer Command Prompt for Microsoft Visual C++
191142
# Using microsoft/setup-msbuild is not enough.
192143
uses: ilammy/msvc-dev-cmd@v1

0 commit comments

Comments
 (0)