diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-08-17 22:04:36 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-08-18 00:12:26 +0200 |
| commit | fb2e48e2b9624f8b431f926399f5827957bcaa2d (patch) | |
| tree | dc51dd2b555821226554065770047ef308f8a79f | |
| parent | 5ee5ccafb6cda327f302090779545590045ed611 (diff) | |
| download | gobject-introspection-fb2e48e2b9624f8b431f926399f5827957bcaa2d.tar.gz | |
ci: force enable doctool and gtkdoc1.57.3
doctool is an auto option and was disabled by the recent addition of
a new dependency on the markdown Python module. Since we didn't have that
in our testing docker image the tests were just skipped.
This makes sure we error out if any dependencies are missing again.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1ccd46f..357e673f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ fedora-x86_64-autotools-python2: CFLAGS: "-Werror" script: - sed -i 's|\[glib-2\.0 >= [0-9.]*\]|[glib-2.0 >= 1.0]|' configure.ac - - ./autogen.sh --with-python=python2 + - ./autogen.sh --with-python=python2 --enable-gtk-doc --enable-doctool - make -j4 - make check - python2 -m pip install --user flake8 @@ -76,7 +76,7 @@ fedora-x86_64-autotools-python3: CFLAGS: "-Werror" script: - sed -i 's|\[glib-2\.0 >= [0-9.]*\]|[glib-2.0 >= 1.0]|' configure.ac - - ./autogen.sh --with-python=python3 + - ./autogen.sh --with-python=python3 --enable-gtk-doc --enable-doctool - make -j4 - make check - python3 -m pip install --user flake8 diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index e3083b47..5c291a8c 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -39,11 +39,13 @@ RUN dnf -y install \ python3 \ python3-devel \ python3-mako \ + python3-markdown \ python3-pip \ python3-wheel \ python2 \ python2-devel \ python2-mako \ + python2-markdown \ redhat-rpm-config \ systemtap-sdt-devel \ zlib-devel \ |