summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2017-06-07 21:02:52 +0100
committerRichard Hughes <richard@hughsie.com>2017-06-07 21:02:52 +0100
commit168529e4ad03313e9cd8177f1549172e553a2b2e (patch)
tree942ec9f65fe5ee68ab7a788b8a8a55ec0d81433f
parente048a48e2fe7f9b00d6c8c36147db00a138e4293 (diff)
downloadappstream-glib-168529e4ad03313e9cd8177f1549172e553a2b2e.tar.gz
f
-rw-r--r--.travis.yml4
-rwxr-xr-xcontrib/ci/build_and_test.sh3
2 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 3f480b8..30f27e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,5 +10,5 @@ before_script:
- docker build -t appstream-glib-debian -f contrib/ci/Dockerfile-debian .
script:
- - docker run -t -v `pwd`:/build appstream-glib-fedora ./contrib/ci/build_and_test.sh
- - docker run -t -v `pwd`:/build appstream-glib-debian ./contrib/ci/build_and_test.sh -Denable-rpm=false
+ - docker run -t -v `pwd`:/build appstream-glib-fedora ./contrib/ci/build_and_test.sh -Denable-rpm=true -Denable-dep11=false
+ - docker run -t -v `pwd`:/build appstream-glib-debian ./contrib/ci/build_and_test.sh -Denable-rpm=false -Denable-dep11=true
diff --git a/contrib/ci/build_and_test.sh b/contrib/ci/build_and_test.sh
index 26aa264..7a5a490 100755
--- a/contrib/ci/build_and_test.sh
+++ b/contrib/ci/build_and_test.sh
@@ -4,8 +4,7 @@ set -e
mkdir -p build && cd build
meson .. \
-Denable-gtk-doc=true \
- -Denable-stemmer=true \
- -Denable-dep11=true $@
+ -Denable-stemmer=true $@
ninja
ninja test -v
DESTDIR=/tmp/install-ninja ninja install