diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d54b12ed3..ef156c2c30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ stages: - date '+%Y%m%d-%H%M%S'; ! grep -q '^NAME=.*\(CentOS\)' /etc/os-release || (yum install -y glibc-common && localedef -c -i pl_PL -f UTF-8 pl_PL.UTF-8 && locale -a) - - date '+%Y%m%d-%H%M%S'; NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES + - date '+%Y%m%d-%H%M%S'; NM_NO_EXTRA=1 NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES - date '+%Y%m%d-%H%M%S'; yum install -y glibc-langpack-pl ccache clang which # containers have "tsflags=nodocs" in /etc/dnf/dnf.conf. We need /usr/shared/gtk-doc/html diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 6be678b318..b656db8de4 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -28,14 +28,23 @@ install_ignore_missing() { done } +if test "$NM_NO_EXTRA" != 1; then + # these packages are convenient for developing, but not necessary + # for CI testing. + EXTRA_PACKAGES=( + bash-completion \ + cscope \ + ) +else + EXTRA_PACKAGES=() +fi + install \ ModemManager-devel \ ModemManager-glib-devel \ audit-libs-devel \ - bash-completion \ bluez-libs-devel \ bzip2 \ - cscope \ dbus-devel \ dbus-python \ dbus-x11 \ @@ -58,6 +67,7 @@ install \ libuuid-devel \ make \ meson \ + mobile-broadband-provider-info-devel \ newt-devel \ nss-devel \ polkit-devel \ @@ -75,7 +85,7 @@ install \ vala-tools \ valgrind \ wireless-tools-devel \ - #end + "${EXTRA_PACKAGES[@]}" # some packages don't exist in certain distributions. Install them one-by-one, and ignore errors. install_ignore_missing \