diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2020-12-08 19:19:55 +0100 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2020-12-08 19:19:55 +0100 |
| commit | 324aaada7344167b3fb34041466b0abc55ec2ee0 (patch) | |
| tree | 68b76a28cdb64ed2f3567a7f758d7692c3049a77 | |
| parent | f47db79eb566bfe8ed6fca5b31e29bcce0ccdd74 (diff) | |
travis up to 5.15.2
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index edb83801..361c4789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; 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.15.2-bionic; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi addons: coverity_scan: @@ -33,7 +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" ]; then sudo apt-get -qq install qt514base qt514tools qt514svg libgl1-mesa-dev; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt515base qt515tools qt515svg 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 @@ -41,7 +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" ]; then source /opt/qt514/bin/qt514-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt515/bin/qt515-env.sh; fi - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash" - qmake -v script: |