From 2e1dafd02006abc0944d918c2f510ba0b52ea9da Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 7 Sep 2017 11:05:39 +0100 Subject: Fixing build --- .travis.yml | 42 +++++++++++++++++++++++++++++++----------- README.md | 3 +++ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b85ed10d..b5c22c9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,31 @@ sudo: required os: linux dist: trusty -compiler: - - gcc +branches: + only: + - master + - develop + +notifications: + email: false + +git: + depth: 3 + +############# +# Compilers # +############# + +matrix: + include: + - os: linux + compiler: gcc + - os: linux + compiler: clang + +################ +# Dependencies # +################ before_install: - sudo apt-get -qq update @@ -14,17 +37,14 @@ before_install: - sudo apt-get install -y libsdl2-dev - sudo apt-get install -y libglm-dev +################ +# Build Script # +################ + script: - cd $TRAVIS_BUILD_DIR - - mkdir build + - mkdir -p build - cd build - cmake .. - make - -branches: - only: - - master - - develop - -notifications: - email: false + - ctest diff --git a/README.md b/README.md index 7c16002a..cbbe07b3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ YAGE {#mainpage} ==== +master build status: ![master-build](https://travis-ci.org/ymherklotz/YAGE.svg?branch=master) +develop build status: ![develop-build](https://travis-ci.org/ymherklotz/YAGE.svg?branch=develop) + Introduction ------------ -- cgit