diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae6faedfa..c0514aba6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,8 +56,8 @@ stages: inherit: default: false variables: - MONADO_WIN_BASE_TAG: "20250418.0" - MONADO_WIN_MAIN_TAG: "20250418.0" + MONADO_WIN_BASE_TAG: "20251127.3" + MONADO_WIN_MAIN_TAG: "20251127.3" 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 4e2144456..9512a76ed 100644 --- a/.gitlab-ci/templates/include.win_containers.yml +++ b/.gitlab-ci/templates/include.win_containers.yml @@ -1,6 +1,6 @@ # {#- included by .gitlab-ci.yml.jinja #} # {#- SPDX-License-Identifier: CC0-1.0 #} -# {#- SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors #} +# {#- SPDX-FileCopyrightText: 2018-2025 Collabora, Ltd. and the Monado contributors #} ### # Windows container-related jobs (prep and usage) @@ -9,8 +9,8 @@ inherit: default: false variables: - MONADO_WIN_BASE_TAG: "20250418.0" - MONADO_WIN_MAIN_TAG: "20250418.0" + MONADO_WIN_BASE_TAG: "20251127.3" + MONADO_WIN_MAIN_TAG: "20251127.3" 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 0b46b326f..8eb84c424 100644 --- a/.gitlab-ci/windows/monado_deps_build.ps1 +++ b/.gitlab-ci/windows/monado_deps_build.ps1 @@ -1,9 +1,9 @@ # Copyright 2019-2022, Mesa contributors -# Copyright 2022, Collabora, Ltd. +# Copyright 2022-2025, Collabora, Ltd. # SPDX-License-Identifier: MIT # Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/8396df5ad90aeb6ab2267811aba2187954562f81/.gitlab-ci/windows/mesa_deps_build.ps1 -$VulkanRTVersion = "1.3.283.0" +$VulkanRTVersion = "1.4.328.1" # Download new TLS certs from Windows Update Get-Date @@ -28,7 +28,7 @@ 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" +Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$VulkanRTVersion/windows/VulkanRT-X64-$VulkanRTVersion-Installer.exe" -OutFile "$VulkanInstaller" Start-Process -NoNewWindow -Wait "$VulkanInstaller" -ArgumentList "/S" if (!$?) { Write-Host "Failed to install Vulkan runtime components" diff --git a/.gitlab-ci/windows/monado_deps_vs2022.ps1 b/.gitlab-ci/windows/monado_deps_vs2022.ps1 index dcf90ef03..d5d5ad0e0 100644 --- a/.gitlab-ci/windows/monado_deps_vs2022.ps1 +++ b/.gitlab-ci/windows/monado_deps_vs2022.ps1 @@ -1,5 +1,5 @@ # Copyright 2019-2022, Mesa contributors -# Copyright 2022, Collabora, Ltd. +# Copyright 2022-2025, Collabora, Ltd. # SPDX-License-Identifier: MIT # Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/8396df5ad90aeb6ab2267811aba2187954562f81/.gitlab-ci/windows/mesa_deps_vs2019.ps1 @@ -29,7 +29,7 @@ $vsInstallerArgs = @( "--add" "Microsoft.VisualStudio.Component.Windows10SDK" "--add" - "Microsoft.VisualStudio.Component.Windows11SDK.22000" + "Microsoft.VisualStudio.Component.Windows11SDK.26100" "--add" "Component.Microsoft.Windows.CppWinRT" "--add"