The open source OpenXR runtime
ci: Bump windows image
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2643>
+10
-10
+2
-2
.gitlab-ci.yml
+2
-2
.gitlab-ci.yml
···
56
56
inherit:
57
57
default: false
58
58
variables:
59
-
MONADO_WIN_BASE_TAG: "20250418.0"
60
-
MONADO_WIN_MAIN_TAG: "20250418.0"
59
+
MONADO_WIN_BASE_TAG: "20251127.3"
60
+
MONADO_WIN_MAIN_TAG: "20251127.3"
61
61
MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
62
62
MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"
63
63
+3
-3
.gitlab-ci/templates/include.win_containers.yml
+3
-3
.gitlab-ci/templates/include.win_containers.yml
···
1
1
# {#- included by .gitlab-ci.yml.jinja #}
2
2
# {#- SPDX-License-Identifier: CC0-1.0 #}
3
-
# {#- SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors #}
3
+
# {#- SPDX-FileCopyrightText: 2018-2025 Collabora, Ltd. and the Monado contributors #}
4
4
5
5
###
6
6
# Windows container-related jobs (prep and usage)
···
9
9
inherit:
10
10
default: false
11
11
variables:
12
-
MONADO_WIN_BASE_TAG: "20250418.0"
13
-
MONADO_WIN_MAIN_TAG: "20250418.0"
12
+
MONADO_WIN_BASE_TAG: "20251127.3"
13
+
MONADO_WIN_MAIN_TAG: "20251127.3"
14
14
MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
15
15
MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"
16
16
+3
-3
.gitlab-ci/windows/monado_deps_build.ps1
+3
-3
.gitlab-ci/windows/monado_deps_build.ps1
···
1
1
# Copyright 2019-2022, Mesa contributors
2
-
# Copyright 2022, Collabora, Ltd.
2
+
# Copyright 2022-2025, Collabora, Ltd.
3
3
# SPDX-License-Identifier: MIT
4
4
# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/8396df5ad90aeb6ab2267811aba2187954562f81/.gitlab-ci/windows/mesa_deps_build.ps1
5
5
6
-
$VulkanRTVersion = "1.3.283.0"
6
+
$VulkanRTVersion = "1.4.328.1"
7
7
8
8
# Download new TLS certs from Windows Update
9
9
Get-Date
···
28
28
Get-Date
29
29
Write-Host "Installing Vulkan runtime components"
30
30
$VulkanInstaller = "C:\VulkanRTInstaller.exe"
31
-
Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$VulkanRTVersion/windows/VulkanRT-$VulkanRTVersion-Installer.exe" -OutFile "$VulkanInstaller"
31
+
Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$VulkanRTVersion/windows/VulkanRT-X64-$VulkanRTVersion-Installer.exe" -OutFile "$VulkanInstaller"
32
32
Start-Process -NoNewWindow -Wait "$VulkanInstaller" -ArgumentList "/S"
33
33
if (!$?) {
34
34
Write-Host "Failed to install Vulkan runtime components"
+2
-2
.gitlab-ci/windows/monado_deps_vs2022.ps1
+2
-2
.gitlab-ci/windows/monado_deps_vs2022.ps1
···
1
1
# Copyright 2019-2022, Mesa contributors
2
-
# Copyright 2022, Collabora, Ltd.
2
+
# Copyright 2022-2025, Collabora, Ltd.
3
3
# SPDX-License-Identifier: MIT
4
4
# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/8396df5ad90aeb6ab2267811aba2187954562f81/.gitlab-ci/windows/mesa_deps_vs2019.ps1
5
5
···
29
29
"--add"
30
30
"Microsoft.VisualStudio.Component.Windows10SDK"
31
31
"--add"
32
-
"Microsoft.VisualStudio.Component.Windows11SDK.22000"
32
+
"Microsoft.VisualStudio.Component.Windows11SDK.26100"
33
33
"--add"
34
34
"Component.Microsoft.Windows.CppWinRT"
35
35
"--add"