From 14e624bf4397dbb32d9ed3d8e9df23e29f16059a Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Wed, 20 Dec 2023 13:12:09 +0800 Subject: [PATCH] ci/msvc: Install msvc2019 only from vs2022 Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/windows/mesa_deps_msvc.ps1 | 7 +++---- .gitlab-ci/windows/mesa_init_msvc.ps1 | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/windows/mesa_deps_msvc.ps1 b/.gitlab-ci/windows/mesa_deps_msvc.ps1 index 649847f7e0e..019cbb79607 100644 --- a/.gitlab-ci/windows/mesa_deps_msvc.ps1 +++ b/.gitlab-ci/windows/mesa_deps_msvc.ps1 @@ -22,11 +22,10 @@ Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe ` "--norestart", ` "--nocache", ` "--installPath", "C:\BuildTools", ` -"--add", "Microsoft.VisualStudio.Component.VC.ASAN", ` "--add", "Microsoft.VisualStudio.Component.VC.Redist.14.Latest", ` -"--add", "Microsoft.VisualStudio.Component.VC.ATL", ` -"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", ` -"--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", ` +"--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", ` +"--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", ` +"--add", "Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", ` "--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", ` "--add", "Microsoft.VisualStudio.Component.Graphics.Tools", ` "--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348" diff --git a/.gitlab-ci/windows/mesa_init_msvc.ps1 b/.gitlab-ci/windows/mesa_init_msvc.ps1 index 01f9a7deb2c..f75cd36f5b9 100644 --- a/.gitlab-ci/windows/mesa_init_msvc.ps1 +++ b/.gitlab-ci/windows/mesa_init_msvc.ps1 @@ -8,4 +8,4 @@ Import-Module (Join-Path $vsInstallPath "Common7\Tools\Microsoft.VisualStudio.De # VS2017 14.1 to 14.16 use -vcvars_ver=14.16 # VS2019 14.20 to 14.29 use -vcvars_ver=14.29 # VS2022 14.30 to 14.38 (not finished yet) use -vcvars_ver=14 to choose the newest version -Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation -DevCmdArguments '-vcvars_ver=14 -arch=x64 -no_logo -host_arch=amd64' +Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation -DevCmdArguments '-vcvars_ver=14.29 -arch=x64 -no_logo -host_arch=amd64'