diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-11-24 15:47:49 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-11-24 15:47:49 +0000 |
| commit | 70100f8584c762cbc6cbc09d05cc4e9d22a3ec75 (patch) | |
| tree | 4b332aec70a71eb4f626205eef9ccb1408ca8d8d /.github | |
| parent | 1a889f7ea043fc61865511a0d143321bbdc540a5 (diff) | |
Revert "ci: Avoid toolset ambiguity that MSVC can't handle"
This reverts commit 91d5bd8ac9a28725c735f8e6900bc85673bb190a.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9419a0f19a..cdf8e8e6c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,55 +138,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Fix Visual Studio installation - # Avoid toolset ambiguity that MSVC can't handle. - run: | - Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" - $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" - $componentsToRemove= @( - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64" - "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre" - ) - [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " + $_} - $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') - # should be run twice - $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden - $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden - - name: Configure Developer Command Prompt for Microsoft Visual C++ # Using microsoft/setup-msbuild is not enough. uses: ilammy/msvc-dev-cmd@v1 |