diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2020-05-29 23:44:12 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2020-05-29 23:44:12 +0200 |
| commit | 12d960931f6b954ab92d3c74b3e17fbc805f7d92 (patch) | |
| tree | 0182f3f88936f45a4fac9d47b4f94aed6273cc14 /.travis.yml | |
| parent | a18c442ee1fcddde5c64992b9f190083bd61efcc (diff) | |
Revert "Let's try some matrix magic"
This reverts commit a18c442ee1fcddde5c64992b9f190083bd61efcc.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index e8ff78e4..384803ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,9 @@ language: cpp -matrix: - include: - - os: linux - env: - - QT_BASE=59 - - os: linux - env: - - QT_BASE=514 - - os: osx dist: bionic sudo: true +os: +- linux +- osx compiler: - gcc - clang @@ -17,8 +11,7 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: -- if [[ "$TRAVIS_OS_NAME" = "linux" && "$QT_BASE" = "59" ]]; then sudo add-apt-repository -y ppa:beineri/opt-qt-5.9.7-bionic; fi -- if [[ "$TRAVIS_OS_NAME" = "linux" && "$QT_BASE" = "514" ]]; then sudo add-apt-repository -y ppa:beineri/opt-qt-5.14.2-bionic; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt-5.12.3-bionic; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi addons: coverity_scan: @@ -40,8 +33,7 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then nvm use 12; fi - 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" && "$QT_BASE" = "59" ]]; then sudo apt-get -qq install qt59base qt59tools qt59svg libgl1-mesa-dev; fi -- if [[ "$TRAVIS_OS_NAME" = "linux" && "$QT_BASE" = "514" ]]; then sudo apt-get -qq install qt514base qt514tools qt514svg libgl1-mesa-dev; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt512base qt512tools qt512svg libgl1-mesa-dev; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo apt-get -qq install g++-6 gcc-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-6 90; fi @@ -49,8 +41,7 @@ install: - 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" && "$QT_BASE" = "59" ]; then source /opt/qt512/bin/qt59-env.sh; fi -- if [ "$TRAVIS_OS_NAME" = "linux" && "$QT_BASE" = "514" ]; then source /opt/qt512/bin/qt514-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt512/bin/qt512-env.sh; fi - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash" - qmake -v script: |