Module: Mesa Branch: main Commit: 9e89e7a7c2b0ea1186e1bf6cdc79a855ce311601 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e89e7a7c2b0ea1186e1bf6cdc79a855ce311601
Author: Yonggang Luo <[email protected]> Date: Wed Dec 20 04:39:56 2023 +0800 ci/msvc: Install graphics tools(DirectX debug layer) easy to stuck, place it at the beginning Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26736> --- .gitlab-ci/windows/mesa_deps_choco.ps1 | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci/windows/mesa_deps_choco.ps1 b/.gitlab-ci/windows/mesa_deps_choco.ps1 index 2a7df22f596..5255839f3d2 100644 --- a/.gitlab-ci/windows/mesa_deps_choco.ps1 +++ b/.gitlab-ci/windows/mesa_deps_choco.ps1 @@ -9,6 +9,27 @@ Foreach ($file in (Get-ChildItem -Path "$certdir\*" -Include "*.crt")) { } Remove-Item -Recurse -Path $certdir +Get-Date +Write-Host "Installing graphics tools (DirectX debug layer)" +Set-Service -Name wuauserv -StartupType Manual +if (!$?) { + Write-Host "Failed to enable Windows Update" + Exit 1 +} + +For ($i = 0; $i -lt 5; $i++) { + Dism /online /quiet /add-capability /capabilityname:Tools.Graphics.DirectX~~~~0.0.1.0 + $graphics_tools_installed = $? + if ($graphics_tools_installed) { + Break + } +} + +if (!$graphics_tools_installed) { + Write-Host "Failed to install graphics tools" + Get-Content C:\Windows\Logs\DISM\dism.log + Exit 1 +} Get-Date Write-Host "Installing Chocolatey" @@ -72,24 +93,3 @@ if (!$?) { } Remove-Item C:\vulkan-runtime.exe -Force -Get-Date -Write-Host "Installing graphics tools (DirectX debug layer)" -Set-Service -Name wuauserv -StartupType Manual -if (!$?) { - Write-Host "Failed to enable Windows Update" - Exit 1 -} - -For ($i = 0; $i -lt 5; $i++) { - Dism /online /quiet /add-capability /capabilityname:Tools.Graphics.DirectX~~~~0.0.1.0 - $graphics_tools_installed = $? - if ($graphics_tools_installed) { - Break - } -} - -if (!$graphics_tools_installed) { - Write-Host "Failed to install graphics tools" - Get-Content C:\Windows\Logs\DISM\dism.log - Exit 1 -}
