diff options
| author | Richard Hughes <richard@hughsie.com> | 2017-06-07 19:50:05 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-06-07 19:50:05 +0100 |
| commit | 8eb68e5848deaf5153a9b3dea74bd74a56e2a0c7 (patch) | |
| tree | e0a27e2c7aeb7bd407cf2c42201e7da2ea2b83a6 | |
| parent | 5797f44514abd62cd33f85880f2452f7679d7783 (diff) | |
| download | appstream-glib-8eb68e5848deaf5153a9b3dea74bd74a56e2a0c7.tar.gz | |
f
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | contrib/ci/Dockerfile-debian | 2 | ||||
| -rwxr-xr-x | contrib/ci/build_and_test.sh | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 493ac60..0fbb982 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ services: - docker before_script: - - docker build -t packagekit-fedora -f contrib/ci/Dockerfile-fedora . - - docker build -t packagekit-debian -f contrib/ci/Dockerfile-debian . + - docker build -t appstream-glib-fedora -f contrib/ci/Dockerfile-fedora . + - docker build -t appstream-glib-debian -f contrib/ci/Dockerfile-debian . script: - - docker run -t -v `pwd`:/build packagekit-fedora ./contrib/ci/build_and_test.sh - - docker run -t -v `pwd`:/build packagekit-debian ./contrib/ci/build_and_test.sh + - 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 diff --git a/contrib/ci/Dockerfile-debian b/contrib/ci/Dockerfile-debian index faa11a0..4fed956 100644 --- a/contrib/ci/Dockerfile-debian +++ b/contrib/ci/Dockerfile-debian @@ -2,7 +2,7 @@ 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 +RUN apt-get install -y 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 1ab9885..0b289d5 100755 --- a/contrib/ci/build_and_test.sh +++ b/contrib/ci/build_and_test.sh @@ -1,6 +1,7 @@ #!/bin/sh set -e +mkdir build meson .. $@ ninja ninja test -v |