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

ci: bump windows image

Browse source 
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2140>
This commit is contained in:
Simon Zeni 2024-06-07 18:15:16 -04:00
parent fa81698f01
commit 58d388cdb4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -51,8 +51,8 @@ stages:
inherit: inherit:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20230422.0" MONADO_WIN_BASE_TAG: "20240607.0"
MONADO_WIN_MAIN_TAG: "20230422.0" MONADO_WIN_MAIN_TAG: "20240607.0"
MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2022/vs2022" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"

4
.gitlab-ci/templates/include.win_containers.yml
View file

@ -9,8 +9,8 @@
inherit: inherit:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20230422.0" MONADO_WIN_BASE_TAG: "20240607.0"
MONADO_WIN_MAIN_TAG: "20230422.0" MONADO_WIN_MAIN_TAG: "20240607.0"
MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2022/vs2022" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"

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

@ -3,7 +3,7 @@
# 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" $VulkanRTVersion = "1.3.283.0"
# Download new TLS certs from Windows Update # Download new TLS certs from Windows Update
Get-Date Get-Date
@ -59,6 +59,6 @@ Set-Location vcpkg
Get-Date Get-Date
Write-Host "Installing some base deps from vcpkg" Write-Host "Installing some base deps from vcpkg"
./vcpkg.exe install cjson:x64-windows eigen3:x64-windows wil:x64-windows pthreads:x64-windows glslang:x64-windows libusb:x64-windows hidapi:x64-windows sdl2[base,vulkan]:x64-windows ./vcpkg.exe install cjson:x64-windows eigen3:x64-windows wil:x64-windows pthreads:x64-windows glslang:x64-windows libusb:x64-windows hidapi:x64-windows sdl2:x64-windows sdl2[vulkan]:x64-windows
Remove-Item -Recurse -Path downloads Remove-Item -Recurse -Path downloads
Remove-Item -Recurse -Path buildtrees Remove-Item -Recurse -Path buildtrees