[gtk-doc] ci: tweak ci setup more

[Stefan Sauer <stefkost src gnome org>]

commit a4dcdd321d7369a75b4559557e6374f430bca35d
Author: Stefan Sauer <ensonic users sf net>
Date:   Thu Dec 13 22:31:10 2018 +0100

    ci: tweak ci setup more
    
    - Drop dblatex again - it has too many deps and hence slows down cycles.
    - Add autogen step to test job, since jos are independent.
    - Merge the coverage report into the Makefile coverage target
    - Fix the coverage sumary regexp
    - Add a meson build step

 .gitlab-ci.yml    | 35 +++++++++++++++++++++++++++--------
 tests/Makefile.am |  3 ++-
 2 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f630a6..e5ecb96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,16 @@
 image: debian:unstable
 
+# TODO: tune dependencies
+# - maybe install dblatex for pdf, we skip it now since this installs tons of
+#   latex and thats slow
+# - gtkdoc-mkhtml2 needs the anytree python module - install through pip3
 before_script:
   - apt update -qq
-  - apt install -y -qq autoconf automake build-essential libtool make pkg-config
-                       dblatex docbook-xsl libxml2-utils xsltproc libglib2.0-dev
-                       python3-lxml python3-parameterized python3-pip
-                       python3-pygments python3-unittest2
+  - apt install -y -qq --no-install-recommends
+                autoconf automake build-essential libtool make meson pkg-config
+                docbook-xsl libxml2-utils xsltproc libglib2.0-dev
+                python3-lxml python3-parameterized python3-pip
+                python3-pygments python3-unittest2
   - export LANG=C.UTF-8
 
 stages:
@@ -13,7 +18,9 @@ stages:
   - test
   - deploy
 
-build-job:
+# autotools
+
+autotools-build:
   stage: build
   script:
     - ./autogen.sh --prefix=/usr
@@ -21,13 +28,25 @@ build-job:
   except:
     - tags
 
-test:
+autotools-test:
   stage: test
   script:
+    - ./autogen.sh --prefix=/usr
     - make check
     - make -C tests coverage
-    - cd test && python3-coverage report --include="*/gtkdoc/*.py"
-  coverage: '/^TOTAL\s+[\d\s]*?\s+([\d.]+\%)\s+/'
+  coverage: '/^TOTAL\s+\d+\s+\d+\s+([\d.]+\%)/'
+
+# meson
+
+meson-build:
+  stage: build
+  script:
+    - meson --prefix /usr _build .
+    - ninja -C _build
+  except:
+    - tags
+
+# common
 
 pages:
   stage: deploy
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9ff892c..87edc44 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,8 @@ coverage:
        for f in *.py; do \
          $(TESTS_ENVIRONMENT) python3-coverage run -a $$f; \
        done; \
-       python3-coverage html --include="*/gtkdoc/*.py"
+       python3-coverage html --include="*/gtkdoc/*.py"; \
+       python3-coverage report --include="*/gtkdoc/*.py"
 
 
 .PHONY: snapshot