diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index a771ca254bc..163930e6faa 100644 --- a/.gitlab-ci/windows/mesa_deps_build.ps1 +++ b/.gitlab-ci/windows/mesa_deps_build.ps1 @@ -21,7 +21,7 @@ Write-Host "Installing Chocolatey packages" For ($i = 0; $i -lt 5; $i++) { choco install -y python3 --params="/InstallDir:C:\python3" $python_install = $? - choco install --allow-empty-checksums -y cmake git git-lfs ninja pkgconfiglite winflexbison vulkan-sdk --installargs "ADD_CMAKE_TO_PATH=System" + choco install --allow-empty-checksums -y cmake git git-lfs ninja pkgconfiglite winflexbison --installargs "ADD_CMAKE_TO_PATH=System" $other_install = $? $choco_installed = $other_install -and $python_install if ($choco_installed) { @@ -40,6 +40,14 @@ Update-SessionEnvironment # until we start a new shell $env:PATH = "C:\python3;C:\python3\scripts;C:\Program Files\CMake\bin;$env:PATH" +Invoke-WebRequest -Uri 'https://sdk.lunarg.com/sdk/download/latest/windows/vulkan_sdk.exe' -OutFile 'C:\vulkan_sdk.exe' +C:\vulkan_sdk.exe --am --al -c in +if (!$?) { + Write-Host "Failed to install Vulkan SDK" + Exit 1 +} +Remove-Item C:\vulkan_sdk.exe -Force + Start-Process -NoNewWindow -Wait git -ArgumentList 'config --global core.autocrlf false' Get-Date