ci: Install more deps on arch image

Increase the coverage of the CI compile tests
This commit is contained in:
Christoph Haag 2023-03-13 17:05:56 +01:00 committed by Jakob Bornecrantz
parent 6b45e22164
commit 201eb039e6
2 changed files with 48 additions and 3 deletions

View file

@ -55,7 +55,7 @@ include:
.monado.variables.arch:rolling:
variables:
FDO_DISTRIBUTION_VERSION: "rolling"
FDO_DISTRIBUTION_TAG: "2022-09-20.0"
FDO_DISTRIBUTION_TAG: "2023-03-13.2"
stages:
- container_prep
@ -127,7 +127,12 @@ arch:rolling:container_prep:
changes:
- .gitlab-ci/**/*
variables:
FDO_DISTRIBUTION_PACKAGES: 'bluez-libs check clang cmake diffutils doxygen eigen ffmpeg gcc git glfw-x11 glslang graphviz gtk3 hidapi libusb libxrandr mesa ninja opencv patch pkgconfig python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader'
# pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
# python-setuptools glu: librealsense
# glew boost gtest fmt bc: basalt-monado-git
# python-attrs: xr-hardware-git
FDO_DISTRIBUTION_PACKAGES: 'base-devel pipewire-jack wireplumber bluez-libs check clang cmake diffutils doxygen eigen ffmpeg gcc git glfw-x11 glslang graphviz gtk3 hidapi libusb libxrandr mesa ninja opencv patch pkgconfig python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wget meson python-setuptools glu glew boost gtest fmt bc wayland libbsd python-attrs'
FDO_DISTRIBUTION_EXEC: bash .gitlab-ci/install-arch-additional-deps.sh
###
# Container usage base jobs
@ -621,4 +626,4 @@ pages:
- mv repo public/apt
artifacts:
paths:
- public
- public

View file

@ -0,0 +1,40 @@
#!/bin/bash
# Copyright 2023, Collabora, Ltd. and the Monado contributors
# SPDX-License-Identifier: BSL-1.0
cd $(dirname $0)
mkdir -p deps
pushd deps
# xr-hardware-git required by libsurvive-git
# libuvc required by basalt
for PKG in \
xr-hardware-git \
libsurvive-git \
percetto-git \
openhmd-git \
librealsense \
onnxruntime-git \
leap-motion \
libuvc-git \
basalt-monado-git \
do
wget https://aur.archlinux.org/cgit/aur.git/snapshot/"$PKG".tar.gz
tar xfz "$PKG".tar.gz
pushd "$PKG"
# makepkg can not be run as root
chown nobody:users .
su nobody -s /bin/bash -c "MAKEFLAGS=-j$(nproc) makepkg -fs"
pacman -U --noconfirm *.pkg.*
popd
done
popd
# don't keep gigabytes of source code in the container image
rm -rf deps