diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-22 00:02:59 +0100 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-22 00:02:59 +0100 |
commit | 5deb18b72a4993a4baf59b7da24a04116eab31e6 (patch) | |
tree | c7a1523bed9bf7629b311d63e212957a6ae735be /.travis.yml | |
parent | 34396f0483d94229e3a315e5eeb90c77c1425273 (diff) | |
parent | e8208166c67e564fb249aa41e9f8c5e2fa1f2b9a (diff) | |
download | YAGE-5deb18b72a4993a4baf59b7da24a04116eab31e6.tar.gz YAGE-5deb18b72a4993a4baf59b7da24a04116eab31e6.zip |
Merge branch 'develop'
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/.travis.yml b/.travis.yml index 80d86e86..a857df90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,46 +1,39 @@ language: cpp dist: trusty - branches: only: - - master - - develop - + - master + - develop notifications: email: false - git: depth: 1 - -############# -# Compilers # -############# - matrix: include: - - os: linux - compiler: gcc - -################ -# Dependencies # -################ - + - os: linux + env: UNIT_TESTS=1 + compiler: gcc before_install: - - sudo apt-get -qq update - - sudo apt-get install -y libegl1-mesa-dev - - sudo apt-get install -y libgles2-mesa-dev - - sudo apt-get install -y libglew-dev - - sudo apt-get install -y libsdl2-dev - - sudo apt-get install -y libglm-dev - -################ -# Build Script # -################ - +- sudo apt-get -qq update +- sudo apt-get install -y libegl1-mesa-dev +- sudo apt-get install -y libgles2-mesa-dev +- sudo apt-get install -y libglm-dev +- sudo apt-get install -y xorg-dev +- sudo apt-get install -y libglu1-mesa-dev script: - - cd $TRAVIS_BUILD_DIR - - mkdir -p build - - cd build - - cmake -DENABLE_TESTING=1 .. - - make - - ctest +- cd $TRAVIS_BUILD_DIR +- mkdir -p build +- cd build +- cmake .. +- make +- ctest +- | + if [ "$TRAVIS_BRANCH" == "master" ]; then + ./tools/update_docs + exit 0 + else + exit 0 + fi +env: + global: + secure: NGWn7hJAd/iYfJQmr8oDjTlwttldj8zB+X0gk2TqDhAJ2gLiZ2+b8Bp5FSzBlNIyhcbuhzRU+rzkbo03XSwXZXFRZK/gyPMGaB75ay8MLQBrN3L7THXbjQm1SZg2mO17/MKT+rJH/NvhmqPoUoJaYnoki1G6AZfhnDx+3bW4MNp5/g3u8trk1HNvXWTvjdqS99OH36bvoq8BsOi53Po1veeCIWza6JO61n2nRHzCC2sYWtsZyTQSi3B//iie5zF3gvuRorbzjA/ayc8lLmhUsTmoA1t9HJP52fKzv/q3mxllXzyzpWNRmUJCzf7I1wY9jp1FVwojfl0umofzYPCCjwSrKlRtmwQfi0peg7VOJVCCJx7Eh/i0hamGUnDEu0aZnfhgwzkqDDIgO1AwcEv5i9egt/73kK4mdm22sEDa3dWVu37tnj5dItaQesMm6TXKMy9+r7v0aaVJbQB2atvBaf3RlW71P9iy8mOZ+geKNwVFRuBdu5g3oQe5QrqXRi4inMv0bjN8HwOVs/f8ZTGZePnbHnxOnYRErxLnha/bsu7btfDT8Q8nmZ/Rhcu7QkMRNTm5L3+YHFUngiIygOs8wrH6HECtSYwmi9WejRuPgU2GnYR0Rzyi5dyaFok1iN+jsYsY9YFx5tRgxuX4H9CnUlfDabdFSLzqbmKRlbP79as= |