summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-08-31 13:05:02 -0700
committerAdam Jackson <ajax@nwnk.net>2018-11-29 16:57:01 +0000
commiteb0dfaa0c6eb54ca9f8a6d8bf63d346c0fc4f2b9 (patch)
tree8e4ccd1edc0273af82012457be6fd4d6a3236c36
parent199a3bd2756d4e9adc2d9caca7f6b71dd38d7bb7 (diff)
downloadpixman-eb0dfaa0c6eb54ca9f8a6d8bf63d346c0fc4f2b9.tar.gz
pixman-eb0dfaa0c6eb54ca9f8a6d8bf63d346c0fc4f2b9.tar.bz2
pixman-eb0dfaa0c6eb54ca9f8a6d8bf63d346c0fc4f2b9.zip
gitlab-ci: Add meson build to pipeline test
-rw-r--r--.gitlab-ci.yml14
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b506ca3..e850b76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,19 @@
image: fedora:28
-job:
+autotools-build:
script:
- dnf -y install dnf-plugins-core
- dnf -y groupinstall buildsys-build
- dnf -y builddep pixman
- ./autogen.sh
- - make -sj4 check \ No newline at end of file
+ - make -sj4 check
+
+meson-build:
+ script:
+ - dnf -y install dnf-plugins-core
+ - dnf -y groupinstall buildsys-build
+ - dnf -y builddep pixman
+ - dnf -y install ninja-build
+ - python3 -m pip install meson>=0.47.2
+ - meson build
+ - ninja -C build test