mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 02:26:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Fix archlinux container

Browse source 
OpenCV highui now depends on qt6
This commit is contained in:
Christoph Haag 2023-05-22 16:51:34 +02:00
parent f62d08bdce
commit 1af711ec8b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -142,7 +142,7 @@ win:container_prep:
.monado.variables.arch:rolling: .monado.variables.arch:rolling:
variables: variables:
FDO_DISTRIBUTION_VERSION: "rolling" FDO_DISTRIBUTION_VERSION: "rolling"
FDO_DISTRIBUTION_TAG: "2023-03-13.2" FDO_DISTRIBUTION_TAG: "2023-05-22.0"
### ###
# Container prep jobs # Container prep jobs
@ -201,7 +201,7 @@ arch:rolling:container_prep:
- .fdo.container-build@arch # from ci-templates - .fdo.container-build@arch # from ci-templates
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber' FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt6-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber'
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/install-arch-additional-deps.sh' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/install-arch-additional-deps.sh'

4
.gitlab-ci/config.yml
View file

@ -198,7 +198,7 @@ distributions:
- name: arch - name: arch
images: images:
- codename: rolling - codename: rolling
tag: "2023-03-13.2" tag: "2023-05-22.0"
script: install-arch-additional-deps.sh script: install-arch-additional-deps.sh
# pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
# python-setuptools glu: librealsense # python-setuptools glu: librealsense
@ -231,7 +231,7 @@ distributions:
patch: patch:
pkgconfig: pkgconfig:
python3: python3:
qt5-base: qt6-base:
v4l-utils: v4l-utils:
vulkan-headers: vulkan-headers:
vulkan-icd-loader: vulkan-icd-loader: