summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml13
1 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 6de18942..14482a39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,17 @@ sudo: required
services:
- docker
+env:
+ - IMAGE=ubuntu:rolling
+ - IMAGE=fedora:latest
+
language: c
script:
- - docker pull ubuntu:rolling
- - cid=`docker run --tty --detach --volume $TRAVIS_BUILD_DIR:/lightdm --workdir /lightdm ubuntu:rolling`
- - docker exec $cid apt-get update
- - docker exec $cid apt-get install -y --no-install-recommends gtk-doc-tools intltool libaudit-dev libgcrypt20-dev libgirepository1.0-dev libglib2.0-dev libgtk-3-dev libpam0g-dev libqt4-dev libtool libxcb1-dev libxdmcp-dev libxklavier-dev qtbase5-dev valac yelp-tools
+ - docker pull $IMAGE
+ - cid=`docker run --tty --detach --volume $TRAVIS_BUILD_DIR:/lightdm --workdir /lightdm $IMAGE bash`
+ - if [ $IMAGE = "ubuntu:rolling" ]; then docker exec $cid apt-get update; fi
+ - if [ $IMAGE = "ubuntu:rolling" ]; then docker exec $cid apt-get install -y --no-install-recommends gtk-doc-tools intltool libaudit-dev libgcrypt20-dev libgirepository1.0-dev libglib2.0-dev libpam0g-dev libqt4-dev libtool libxcb1-dev libxdmcp-dev libxklavier-dev qtbase5-dev valac yelp-tools; fi
+ - if [ $IMAGE = "fedora:latest" ]; then docker exec $cid dnf install -y audit-libs-devel gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc intltool libgcrypt-devel libtool libxcb-devel libxklavier-devel libXdmcp-devel pam-devel qt-devel qt5-qtbase-devel vala yelp-tools; fi
- docker exec $cid ./autogen.sh --disable-silent-rules --enable-gtk-doc
- docker exec $cid make