From 8c218b8f04d7a8ef5e9dbed48cad938b4fc62e5b Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 20 Sep 2017 23:02:58 +0100 Subject: removed sdl from travis ci --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 80d86e86..dbace256 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,6 @@ 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 ################ -- cgit From 3115da468b465238b5d5c09cc30352dcb3b00370 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 21 Sep 2017 01:29:35 +0100 Subject: Fixing build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index dbace256..0aa8deb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,8 @@ before_install: - 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 ################ # Build Script # -- cgit From 8a78e678b7df0bf8221280f0058e2db0381b3ffa Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 21 Sep 2017 23:42:30 +0100 Subject: #11: Building, #10: Added GLFW --- .travis.yml | 58 ++++++++++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 0aa8deb2..ad2bebed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,46 +1,36 @@ 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 libglm-dev - - sudo apt-get install -y xorg-dev - - sudo apt-get install -y libglu1-mesa-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 -DENABLE_TESTING=1 .. +- make +- ctest +- | + if [ "$TRAVIS_BRANCH" == "master" ] then + ./tools/update_docs + 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= -- cgit From 84a7ec0e6c3f5ca16fad32e3055f47f87fe58b4d Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 21 Sep 2017 23:46:37 +0100 Subject: Fixing build --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ad2bebed..470ecf2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,12 +24,15 @@ script: - cd $TRAVIS_BUILD_DIR - mkdir -p build - cd build -- cmake -DENABLE_TESTING=1 .. +- cmake .. - make - ctest - | if [ "$TRAVIS_BRANCH" == "master" ] then ./tools/update_docs + exit(0) + else + exit(0) fi env: global: -- cgit From da82f26f16eeda8a9795592c30ce55c21772ed12 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 21 Sep 2017 23:52:44 +0100 Subject: lowering test runs and fixing travis file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 470ecf2c..8cedb335 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,9 @@ script: - | if [ "$TRAVIS_BRANCH" == "master" ] then ./tools/update_docs - exit(0) + exit 0 else - exit(0) + exit 0 fi env: global: -- cgit From e8208166c67e564fb249aa41e9f8c5e2fa1f2b9a Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 22 Sep 2017 00:00:09 +0100 Subject: continuing to fix yaml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8cedb335..a857df90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ script: - make - ctest - | - if [ "$TRAVIS_BRANCH" == "master" ] then + if [ "$TRAVIS_BRANCH" == "master" ]; then ./tools/update_docs exit 0 else -- cgit