From 1f195865cc76c127ef7759e0de0ca8319cb3b29e Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Mon, 13 Mar 2017 14:19:02 +0100 Subject: Let's try g++-5 --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25041731..fd2b1880 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi addons: coverity_scan: project: @@ -30,8 +31,10 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt58base qt58tools qt58svg; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install g++-5; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user codecov; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov ; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install lcov; fi before_script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt58/bin/qt58-env.sh; fi @@ -40,7 +43,7 @@ script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then qmake CONFIG+=coverage -Wall qtpass.pro; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc); fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc) coveralls TESTARGS="--platform offscreen"; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then codecov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make distclean; fi - qmake -Wall qtpass.pro - make -j$(nproc) -- cgit v1.2.3