diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2017-03-02 23:56:05 +0100 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2017-03-02 23:56:05 +0100 |
| commit | c03dc2e0d7ee11f5ada154f6e6d433cc597be650 (patch) | |
| tree | 66d783f54827aaafb351cb936bf1e0ce1077ebec /.travis.yml | |
| parent | fb870a75efee345640676021cc30bc128940181a (diff) | |
Back to just 5
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d281a590..e236da34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: cpp dist: trusty sudo: true env: -- QT_BASE=48 - QT_BASE=58 os: - linux @@ -14,7 +13,7 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: -- if [ "$TRAVIS_OS_NAME" = "linux" && "$QT_BASE" != "48" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt${QT_BASE}-trusty; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt${QT_BASE}-trusty; fi addons: coverity_scan: project: @@ -27,8 +26,8 @@ addons: install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew unlink node; brew install node; fi -- if [ "$TRAVIS_OS_NAME" = "osx" && "$QT_BASE" != "48" ]; then brew ls | grep -wq qt5 || brew install qt5; fi -- if [ "$TRAVIS_OS_NAME" = "osx" && "$QT_BASE" != "48" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pandoc; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi |