mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 01:48:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Install sdl2 with vulkan feature

Browse source 
We need to update MONADO_WIN_BASE_TAG and MONADO_WIN_MAIN_TAG to trigger
container rebuilding.
This commit is contained in:
utzcoz 2023-04-19 10:57:17 +00:00
parent 6032b4dc8b
commit 0f2699b02f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -43,8 +43,8 @@ stages:
inherit: inherit:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20221026.0" MONADO_WIN_BASE_TAG: "20230422.0"
MONADO_WIN_MAIN_TAG: "20221026.0" MONADO_WIN_MAIN_TAG: "20230422.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/win_containers.yml
View file

@ -9,8 +9,8 @@
inherit: inherit:
default: false default: false
variables: variables:
MONADO_WIN_BASE_TAG: "20221026.0" MONADO_WIN_BASE_TAG: "20230422.0"
MONADO_WIN_MAIN_TAG: "20221026.0" MONADO_WIN_MAIN_TAG: "20230422.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"

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

@ -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: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 downloads
Remove-Item -Recurse -Path buildtrees Remove-Item -Recurse -Path buildtrees