diff options
author | Didier Raboud <odyx@debian.org> | 2013-01-11 15:58:10 +0100 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2013-01-11 15:59:27 +0100 |
commit | 8daf3c25d6d521f3829b220b73bbe2257bda9aef (patch) | |
tree | e0edfec8fd2a093274cb00aa5d9dd3bb23ffeccd /.travis.yml | |
parent | bcb1b7ca230c7c7be3fc7be152187b95cbe64942 (diff) | |
parent | 35faf628cf8085a9262c2b89999cacdd3f5bee79 (diff) | |
download | colobot-8daf3c25d6d521f3829b220b73bbe2257bda9aef.tar.gz colobot-8daf3c25d6d521f3829b220b73bbe2257bda9aef.tar.bz2 colobot-8daf3c25d6d521f3829b220b73bbe2257bda9aef.zip |
Merge branch 'dev' into debian
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index ed7cf35..ad384f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,15 @@ language: cpp compiler: - gcc + - clang script: debuild -b -us -uc --lintian-opts "-ivI" before_install: - git submodule update --init --recursive + - sudo add-apt-repository ppa:mapnik/boost -y - sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends devscripts dpkg-dev lintian equivs - mk-build-deps --root-cmd sudo --tool "apt-get -qq --no-install-recommends" --install --remove - dch -v 0~git$(date +%Y%m%d%H%M)00-1~travis0 -m "Automated test-build." + - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin +notifications: + email: false |