diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-20 08:27:03 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-20 21:02:16 +0200 |
| commit | f43fb59b6dbbf74e8c5fd5bcd7b5f33d13fcef9b (patch) | |
| tree | 8ea23b0cfa7653c59a0d82d4ffaed74cfb48b926 | |
| parent | a7474edcc6528ac439481faa875c350c9eca815c (diff) | |
| download | NetworkManager-f43fb59b6dbbf74e8c5fd5bcd7b5f33d13fcef9b.tar.gz | |
gitlab-ci: install glib2-doc via "contrib/fedora/REQUIRED_PACKAGES"
We also generate a source tarball and artifact it.
Hence, we need proper gtk-doc links. This requires files in
/usr/share/gtk-doc/html for adding cross links. Install glib2-doc
package.
Note that in containers dnf is configured to not install documentation
files. We need to override that.
(cherry picked from commit a0f31e4038d29c9055a42a1ea8f95ae7fd648579)
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | contrib/fedora/REQUIRED_PACKAGES | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c733d62d2..77387c5649 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,11 @@ stages: before_script: - date '+%Y%m%d-%H%M%S'; NM_INSTALL="dnf install -y" ./contrib/fedora/REQUIRED_PACKAGES - date '+%Y%m%d-%H%M%S'; dnf install -y glibc-langpack-pl ccache clang + + # containers have "tsflags=nodocs" in /etc/dnf/dnf.conf. We need /usr/shared/gtk-doc/html + # to generate proper documentation. + - date '+%Y%m%d-%H%M%S'; dnf reinstall -y --setopt='tsflags=' glib2-doc + - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-ci-patch-gtkdoc.sh || true .debian_install: &debian_install diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 4938ae9162..23a532f9e4 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -35,6 +35,7 @@ install \ gcc-c++ \ gettext-devel \ git \ + glib2-doc \ gnutls-devel \ gobject-introspection-devel \ gtk-doc \ |