summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2017-06-07 20:08:42 +0100
committerRichard Hughes <richard@hughsie.com>2017-06-07 20:08:42 +0100
commitd6b4b6eda7869d2d144e0a3a3fc14764ebf5d75e (patch)
treece21e107730c2d96c59c927c9e0c5511e6165ccc
parent8eb68e5848deaf5153a9b3dea74bd74a56e2a0c7 (diff)
downloadappstream-glib-d6b4b6eda7869d2d144e0a3a3fc14764ebf5d75e.tar.gz
f
-rw-r--r--contrib/ci/Dockerfile-debian3
-rwxr-xr-xcontrib/ci/build_and_test.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/ci/Dockerfile-debian b/contrib/ci/Dockerfile-debian
index 4fed956..b8f6dae 100644
--- a/contrib/ci/Dockerfile-debian
+++ b/contrib/ci/Dockerfile-debian
@@ -2,7 +2,8 @@ FROM debian:stretch
RUN echo "deb-src http://deb.debian.org/debian/ stretch main" >> /etc/apt/sources.list
RUN apt-get update -qq
-RUN apt-get install -y meson gcab
+RUN apt-get install -yq --no-install-recommends meson gcab
RUN apt-get build-dep -yq appstream-glib
+
RUN mkdir /build
WORKDIR /build
diff --git a/contrib/ci/build_and_test.sh b/contrib/ci/build_and_test.sh
index 0b289d5..07b9707 100755
--- a/contrib/ci/build_and_test.sh
+++ b/contrib/ci/build_and_test.sh
@@ -1,8 +1,9 @@
#!/bin/sh
set -e
-mkdir build
+mkdir -p build && cd build
meson .. $@
ninja
ninja test -v
ninja install DEST=/tmp/install_root/
+cd ..