gitlab: Add meson build to CI

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b25396092b7b7e52561731a1114412a47148c797..5362f122a21148b9001cfee629da1f66d163e828 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,10 @@ build:
     - make check-daemon
     - ulimit -c 0 # don't dump core files on tests that are supposed to assert
     - make distcheck
+    - cd ..
+    - meson . build-meson
+    - ninja -C build-meson
   artifacts:
     paths:
       - build/
+      - build-meson/

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index aa4ae673fd3522f327e35f4e67ca92fd3c152b9f..02864c6b12dc58059762482b5d7e94fa0ad44fcf 100644 (file)
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -41,6 +41,8 @@ RUN apt-get update && apt-get install -y \
     libxml-parser-perl \
     libxtst-dev \
     make \
+    meson \
+    ninja-build \
     systemd
 
 # Add a user and set as default for the build. This is safer, in general, and