mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Install Vulkan loader on Windows CI image.

Browse source
This commit is contained in:
Ryan Pavlik 2022-05-20 15:21:51 -05:00 committed by Jakob Bornecrantz
parent 355fb036b5
commit 5986eb375f
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -201,7 +201,7 @@ arch:rolling:container_prep:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20220518.0" MONADO_WIN_BASE_TAG: "20220518.0"
MONADO_WIN_MAIN_TAG: "20220518.0" MONADO_WIN_MAIN_TAG: "20220520.0"
MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2019/vs2022" MONADO_MAIN_IMAGE_PATH: "win2019/vs2022"

2
.gitlab-ci/win_containers.yml
View file

@ -10,7 +10,7 @@
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20220518.0" MONADO_WIN_BASE_TAG: "20220518.0"
MONADO_WIN_MAIN_TAG: "20220518.0" MONADO_WIN_MAIN_TAG: "20220520.0"
MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2019/vs2022" MONADO_MAIN_IMAGE_PATH: "win2019/vs2022"

13
.gitlab-ci/windows/monado_deps_build.ps1
View file

@ -3,6 +3,8 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/8396df5ad90aeb6ab2267811aba2187954562f81/.gitlab-ci/windows/mesa_deps_build.ps1 # Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/8396df5ad90aeb6ab2267811aba2187954562f81/.gitlab-ci/windows/mesa_deps_build.ps1
$VulkanRTVersion = "1.3.211.0"
# Download new TLS certs from Windows Update # Download new TLS certs from Windows Update
Get-Date Get-Date
Write-Host "Updating TLS certificate store" Write-Host "Updating TLS certificate store"
@ -23,6 +25,17 @@ if (!$?) {
} }
Remove-Item "C:\vcredist_x64.exe" -Force Remove-Item "C:\vcredist_x64.exe" -Force
Get-Date
Write-Host "Installing Vulkan runtime components"
$VulkanInstaller = "C:\VulkanRTInstaller.exe"
Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$VulkanRTVersion/windows/VulkanRT-$VulkanRTVersion-Installer.exe" -OutFile "$VulkanInstaller"
Start-Process -NoNewWindow -Wait "$VulkanInstaller" -ArgumentList "/S"
if (!$?) {
Write-Host "Failed to install Vulkan runtime components"
Exit 1
}
Remove-Item "$VulkanInstaller" -Force
Get-Date Get-Date
Write-Host "Installing Scoop" Write-Host "Installing Scoop"
Set-ExecutionPolicy RemoteSigned -Scope CurrentUser Set-ExecutionPolicy RemoteSigned -Scope CurrentUser