diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2017-12-07 11:55:37 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2017-12-07 11:55:37 +1300 |
| commit | ea91d9405ab5433c882ec44d2baaf04ce78999aa (patch) | |
| tree | d566fa990a0585bfa91772c8698e66989a330dae | |
| parent | d4c1c291a59bad84a2806bb087ee5628510c0936 (diff) | |
| download | lightdm-git-ea91d9405ab5433c882ec44d2baaf04ce78999aa.tar.gz | |
Re-attempt to get TravisCI/Docker to work together (take 2)
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index efb5be81..77423256 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: c script: - docker pull ubuntu:latest - - docker run --name ubuntu --workdir $TRAVIS_BUILD_DIR ubuntu:latest bash - - docker exec ubuntu apt-get update - - docker exec ubuntu 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 libxcb1-dev libxdmcp-dev libxklavier-dev qtbase5-dev valac yelp-tools - - docker exec ubuntu ./autogen.sh && make + - cid=`docker run --tty --detach --workdir $TRAVIS_BUILD_DIR ubuntu:latest` + - 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 libxcb1-dev libxdmcp-dev libxklavier-dev qtbase5-dev valac yelp-tools + - docker exec $cid ./autogen.sh && make |