summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan A. Suarez Romero <jasuarez@igalia.com>2017-02-14 13:32:18 +0100
committerJuan A. Suarez Romero <jasuarez@igalia.com>2017-02-14 13:32:18 +0100
commitfcdcd29b1bc6aec03f57dac39b7b5a7df60c8cae (patch)
treeb5926b60f83f15043ee6699681327ab91a778533
parent4538c07aafae1d23211335ecfd51fb97e4f4d96d (diff)
downloadgrilo-fcdcd29b1bc6aec03f57dac39b7b5a7df60c8cae.tar.gz
travis: add Meson build
Include building with Meson.
-rw-r--r--.travis.yml48
1 files changed, 34 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 37357a6..3f6b4b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,27 +7,47 @@ os: linux
services:
- docker
+env:
+ - BUILD=autotools
+ - BUILD=meson
+
before_install:
- docker pull grilofw/grilo:base
-
-script:
- echo FROM grilofw/grilo:base > Dockerfile
- echo ADD . /root/grilo >> Dockerfile
- echo WORKDIR /root/grilo >> Dockerfile
- - echo RUN ./autogen.sh \
- --prefix /usr \
- --enable-gtk-doc
- --enable-introspection \
- --enable-vala \
- --enable-test-ui \
- --enable-grl-net \
- --enable-grl-pls >> Dockerfile
- - echo RUN make >> Dockerfile
- - echo RUN make install >> Dockerfile
- - docker build -t grilofw/grilo:core .
+script:
+ - if [[ "$BUILD" == "autotools" ]]; then
+ echo RUN ./autogen.sh \
+ --prefix /usr \
+ --enable-gtk-doc
+ --enable-introspection \
+ --enable-vala \
+ --enable-test-ui \
+ --enable-grl-net \
+ --enable-grl-pls >> Dockerfile;
+ echo RUN make >> Dockerfile;
+ echo RUN make install >> Dockerfile;
+ docker build -t grilofw/grilo:core .;
+ fi
+ - if [[ "$BUILD" == "meson" ]]; then
+ echo RUN meson \
+ --prefix /usr \
+ -Denable-grl-net=true \
+ -Denable-grl-pls=true \
+ -Denable-gtk-doc=true \
+ -Denable-introspection=true \
+ -Denable-test-ui=true \
+ -Denable-vala=true \
+ . build >> Dockerfile;
+ echo RUN ninja -C build >> Dockerfile;
+ echo RUN ninja -C build install >> Dockerfile;
+ docker build .;
+ fi
+
after_success:
- - if [[ "$TRAVIS_BRANCH" == "master" && -n "$DOCKER_USERNAME" ]]; then
+ - if [[ "$BUILD" == "autotools" && "$TRAVIS_BRANCH" == "master" && -n "$DOCKER_USERNAME" ]]; then
docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
docker push grilofw/grilo:core;
fi