From 1af711ec8b3e2c7455262cb5758ef22e4f1e3f14 Mon Sep 17 00:00:00 2001 From: Christoph Haag Date: Mon, 22 May 2023 16:51:34 +0200 Subject: [PATCH] ci: Fix archlinux container OpenCV highui now depends on qt6 --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/config.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1f841bba..71e4903c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -142,7 +142,7 @@ win:container_prep: .monado.variables.arch:rolling: variables: FDO_DISTRIBUTION_VERSION: "rolling" - FDO_DISTRIBUTION_TAG: "2023-03-13.2" + FDO_DISTRIBUTION_TAG: "2023-05-22.0" ### # Container prep jobs @@ -201,7 +201,7 @@ arch:rolling:container_prep: - .fdo.container-build@arch # from ci-templates 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' diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 563cc961c..b50fa794c 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -198,7 +198,7 @@ distributions: - name: arch images: - codename: rolling - tag: "2023-03-13.2" + tag: "2023-05-22.0" script: install-arch-additional-deps.sh # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively # python-setuptools glu: librealsense @@ -231,7 +231,7 @@ distributions: patch: pkgconfig: python3: - qt5-base: + qt6-base: v4l-utils: vulkan-headers: vulkan-icd-loader: