diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdde220c3..34f63b3a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,8 +51,8 @@ stages: inherit: default: false variables: - MONADO_WIN_BASE_TAG: "20230422.0" - MONADO_WIN_MAIN_TAG: "20230422.0" + MONADO_WIN_BASE_TAG: "20240607.0" + MONADO_WIN_MAIN_TAG: "20240607.0" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022" diff --git a/.gitlab-ci/templates/include.win_containers.yml b/.gitlab-ci/templates/include.win_containers.yml index eff32bd69..507447aac 100644 --- a/.gitlab-ci/templates/include.win_containers.yml +++ b/.gitlab-ci/templates/include.win_containers.yml @@ -9,8 +9,8 @@ inherit: default: false variables: - MONADO_WIN_BASE_TAG: "20230422.0" - MONADO_WIN_MAIN_TAG: "20230422.0" + MONADO_WIN_BASE_TAG: "20240607.0" + MONADO_WIN_MAIN_TAG: "20240607.0" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022" diff --git a/.gitlab-ci/windows/monado_deps_build.ps1 b/.gitlab-ci/windows/monado_deps_build.ps1 index fb3a6c14c..0b46b326f 100644 --- a/.gitlab-ci/windows/monado_deps_build.ps1 +++ b/.gitlab-ci/windows/monado_deps_build.ps1 @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT # 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 Get-Date @@ -59,6 +59,6 @@ Set-Location vcpkg Get-Date 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 buildtrees