summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorArnaud Rebillout <arnaud.rebillout@collabora.com>2018-09-20 09:46:39 +0700
committerArun Raghavan <arun@arunraghavan.net>2018-10-04 08:44:18 +0530
commitd32e61993afafba7f9b07ca9c932564aed32ba45 (patch)
tree9245a6215f4c722ed7541499e36144ceb37fa0dc /.gitlab-ci.yml
parent1bae214d8b2c9c7a0c11ee8bce2b98c775f21ead (diff)
downloadpulseaudio-d32e61993afafba7f9b07ca9c932564aed32ba45.tar.gz
gitlab-ci: Create two different jobs for autotools and meson builds
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml17
1 files changed, 12 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5362f122a..cd80c455a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
image: registry.freedesktop.org/pulseaudio/pulseaudio/ubuntu:18.04
-build:
+build-autotools:
stage: build
script:
- export MAKEFLAGS="-j$(nproc)"
@@ -13,10 +13,17 @@ 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/
+
+build-meson:
+ stage: build
+ script:
+ - meson build
+ - cd build
+ - ninja
+ - ninja test
+ artifacts:
+ paths:
+ - build/