--- qsampler/trunk/.travis.yml 2018/10/17 05:39:52 3433 +++ qsampler/trunk/.travis.yml 2018/11/08 08:02:37 3434 @@ -15,17 +15,15 @@ - master env: -- QT_SELECT=4 - QT_SELECT=5 before_install: - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa -- if [[ "$QT_SELECT" = "5" ]]; then sudo add-apt-repository --yes ppa:beineri/opt-qt-5.10.1-trusty; fi +- sudo add-apt-repository --yes ppa:beineri/opt-qt-5.10.1-trusty - sudo apt-get update -qq install: -- if [[ "$QT_SELECT" = "4" ]]; then sudo apt-get install -qq libqt4-dev; fi -- if [[ "$QT_SELECT" = "5" ]]; then sudo apt-get install -qq qt510base qt510tools qt510x11extras; source /opt/qt510/bin/qt510-env.sh; fi +- sudo apt-get install -qq qt510base qt510tools qt510x11extras; source /opt/qt510/bin/qt510-env.sh - sudo apt-get install -qq liblscp-dev libgig-dev before_script: @@ -33,6 +31,6 @@ - ./autogen.sh script: -- if [ "$QT_SELECT" = "4" ]; then ./configure --enable-qt4; fi -- if [ "$QT_SELECT" = "5" ]; then ./configure; fi -- make && sudo make install +- ./configure +- make +- sudo make install