From 57c55970daa3bdf9b1f459669d7e7aa7c670d00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Thu, 29 May 2014 11:59:11 +0200 Subject: [PATCH] Fixed travis script and qtsdk url --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11e7ed1..053bfe3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,15 @@ language: cpp before_script: - - if [ "$CXX" = "g++" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi - - if [ "$CXX" = "g++" ]; then sudo apt-get update -qq; fi - - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi - - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50; fi - - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50; fi - - wget -O Qt5.2.0.tar.xz https://dl.dropboxusercontent.com/u/20447449/Qt5.2.0.tar.xz + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get update -qq + - sudo apt-get install g++-4.8 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50 + - wget -O Qt5.2.0.tar.xz http://thunderk.net/public/Qt5.2.0.tar.xz - mkdir ~/Qt5.2.0 - tar -xJf Qt5.2.0.tar.xz -C ~/Qt5.2.0 - sudo chmod -R 777 ~/Qt5.2.0/ - - ln -s ~/Qt5.2.0/5.2.0/gcc_64/mkspecs/linux-g++ ~/Qt5.2.0/5.2.0/gcc_64/mkspecs/linux-gcc - make BUILDMODE=debug QTSDK=~/Qt5.2.0/5.2.0/gcc_64 script: make BUILDMODE=debug QTSDK=~/Qt5.2.0/5.2.0/gcc_64 tests