summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Piédallu <felix@piedallu.me>2020-02-20 16:13:06 +0100
committerBastien Nocera <hadess@hadess.net>2020-02-20 18:05:39 +0100
commitcca36dd8924a03becffcd19720cc276976f62038 (patch)
treebea8f1b94efc3cf23b456ada25849bc82466a4ff
parent41267fdbe47c93d377f314780be7b9fb5715686a (diff)
ci: Also build with meson
-rw-r--r--.gitlab-ci.yml19
1 files changed, 18 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bec877b..aaa0ba0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,9 @@ variables:
gettext-devel
automake
autoconf
+ meson
-build:
+build:autotools:
before_script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
script:
@@ -44,3 +45,19 @@ build:
- XDGMIME_PATH=`pwd`/xdgmime/ ./autogen.sh
- make check
- V=1 make distcheck
+
+
+build:meson:
+ before_script:
+ - dnf update -y --nogpgcheck
+ - dnf install -y --nogpgcheck $DEPENDENCIES
+ script:
+ # Compile xdgmime
+ - git clone https://gitlab.freedesktop.org/xdg/xdgmime.git
+ - make -C xdgmime
+
+ # Compile and test shared-mime-info
+ - meson _build
+ - ninja -C _build
+ - ninja -C _build test
+ - ninja -C _build dist