diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63f2d759..1824191e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,7 @@ variables: FEDORA_PACKAGES: 'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk4-devel glib2-devel mtdev-devel diffutils wayland-protocols-devel black clang-analyzer jq rpmdevtools valgrind systemd-udev qemu-img qemu-system-x86-core qemu-system-aarch64-core jq python3-click python3-rich' DEBIAN_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev curl' UBUNTU_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' - ARCH_PACKAGES: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme python-pytest-xdist libwacom gtk4 mtdev diffutils wayland-protocols' + ARCH_PACKAGES: 'git gcc pkgconfig meson check libsystemd libevdev python-pytest-xdist libwacom gtk4 mtdev diffutils' ALPINE_PACKAGES: 'git gcc build-base pkgconfig meson check-dev eudev-dev libevdev-dev libwacom-dev cairo-dev gtk4.0-dev mtdev-dev bash' FREEBSD_PACKAGES: 'git pkgconf meson libepoll-shim libudev-devd libevdev libwacom gtk3 libmtdev bash wayland' ############################ end of package lists ############################# @@ -1153,6 +1153,7 @@ arch:rolling@default-build: variables: FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_TAG: $ARCH_TAG + MESON_ARGS: '-Ddocumentation=false' needs: - "arch:rolling@container-prep" diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 7cddea70..179bb8b6 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -109,17 +109,14 @@ distributions: - check - libsystemd - libevdev - - doxygen - - graphviz - - python-sphinx - - python-recommonmark - - python-sphinx_rtd_theme - python-pytest-xdist - libwacom - gtk4 - mtdev - diffutils - - wayland-protocols + build: + extra_variables: + - "MESON_ARGS: '-Ddocumentation=false'" # python-recommonmark is no longer in the repos - name: alpine tag: *default_tag versions: