From e85aced13bc023fa7432a8e346d80b38598b5913 Mon Sep 17 00:00:00 2001 From: Vlj Date: Tue, 12 Aug 2014 00:38:13 +0200 Subject: [PATCH] Another attempt at fixing travis ci --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 674fece6b..e204c159c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,25 +14,27 @@ before_install: # Update repos - sudo apt-get update -qq # Install dependencies - - sudo apt-get install cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev + - sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014, # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link) - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted" - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32 + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev build-essential + - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev + - sudo apt-get -qq install g++-4.8 script: # First a debug build: - mkdir build-debug - cd build-debug - - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off -CMAKE_CXX_COMPILER=/usr/bin/g++-4.8 -CMAKE_C_COMPILER=/usr/bin/gcc-4.8 - make VERBOSE=1 -j 4 # Then a release build: - cd .. - mkdir build-release - cd build-release - - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off + - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off -CMAKE_CXX_COMPILER=/usr/bin/g++-4.8 -CMAKE_C_COMPILER=/usr/bin/gcc-4.8 - make VERBOSE=1 -j 4 notifications: