summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2015-07-10 01:16:53 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2015-07-10 01:16:53 +0200
commit47bb0e2c7c5d5e8514bab88ffdfc9452d6a49c39 (patch)
tree6fcc4e32f0b24e4f2af06e82021ea82100da2625
parent7f5ce8dc17b1a5d5756978f92464269b95f028af (diff)
http://docs.travis-ci.com/user/migrating-from-legacy/
-rw-r--r--.travis.yml27
1 files changed, 5 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index 9d248efc..631bada9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: cpp
+sudo: false
os:
- linux
@@ -8,30 +9,12 @@ compiler:
- gcc
- clang
-before_install:
- - QtMkspec=$CC
- - $CC --version
-
-install
- - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
- sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
- && sudo apt-add-repository -y ppa:beineri/opt-qt541
- && sudo apt-get -qq update
- && sudo apt-get -qq install g++-4.8 libc6-i386 qt54tools qt54svg qt54webkit
- && export CXX="g++-4.8"
- && export CC="gcc-4.8"
- ;
- else
- brew update
- && brew unlink cmake
- && brew install cmake
- && brew install qt5
- && chmod -R 755 /usr/local/opt/qt5/*
- ;
- fi
+addons:
+ apt:
+ packages:
+ - qt5-default
script:
- - cd qtpass
- qmake -v
- qmake -spec linux-$QtMkspec -Wall qtpass.pro
- make -j$(nproc)