From 0f2699b02f5ed7b27763840ce27a7fe2fb2317b2 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Wed, 19 Apr 2023 10:57:17 +0000 Subject: [PATCH] ci: Install sdl2 with vulkan feature We need to update MONADO_WIN_BASE_TAG and MONADO_WIN_MAIN_TAG to trigger container rebuilding. --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/win_containers.yml | 4 ++-- .gitlab-ci/windows/monado_deps_build.ps1 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 475b28646..c1f841bba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,8 +43,8 @@ stages: inherit: default: false variables: - MONADO_WIN_BASE_TAG: "20221026.0" - MONADO_WIN_MAIN_TAG: "20221026.0" + MONADO_WIN_BASE_TAG: "20230422.0" + MONADO_WIN_MAIN_TAG: "20230422.0" MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base" MONADO_MAIN_IMAGE_PATH: "win2022/vs2022" diff --git a/.gitlab-ci/win_containers.yml b/.gitlab-ci/win_containers.yml index 0ffafc01f..23b81546e 100644 --- a/.gitlab-ci/win_containers.yml +++ b/.gitlab-ci/win_containers.yml @@ -9,8 +9,8 @@ inherit: default: false variables: - MONADO_WIN_BASE_TAG: "20221026.0" - MONADO_WIN_MAIN_TAG: "20221026.0" + MONADO_WIN_BASE_TAG: "20230422.0" + MONADO_WIN_MAIN_TAG: "20230422.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 23477f489..fb3a6c14c 100644 --- a/.gitlab-ci/windows/monado_deps_build.ps1 +++ b/.gitlab-ci/windows/monado_deps_build.ps1 @@ -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: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[base,vulkan]:x64-windows Remove-Item -Recurse -Path downloads Remove-Item -Recurse -Path buildtrees