Mesa (main): CI/windows: Install Vulkan SDK from LunarG directly isntead of Chocolatey
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue May 31 18:56:28 UTC 2022
Module: Mesa
Branch: main
Commit: a1951b2d0b9537b14eddd92260e3908e0aa76c54
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1951b2d0b9537b14eddd92260e3908e0aa76c54
Author: Jesse Natalie <jenatali at microsoft.com>
Date: Fri May 27 10:20:23 2022 -0700
CI/windows: Install Vulkan SDK from LunarG directly isntead of Chocolatey
Acked-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16756>
---
.gitlab-ci/windows/mesa_deps_build.ps1 | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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
More information about the mesa-commit
mailing list