Fix travis Qt version

This commit is contained in:
xarkes 2017-10-11 14:18:34 +02:00
parent d53fd621c5
commit ed0d680355

View File

@ -6,13 +6,17 @@ os:
- linux - linux
- osx - osx
env:
- TEST_COMMAND="qmake PREFIX=/usr APPIMAGE=1 ../src && make -j4"
- TEST_COMMAND="cmake ../src && make -j4"
sudo: required sudo: required
dist: trusty dist: trusty
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y && sudo add-apt-repository ppa=beineri/opt-qt591-trusty -y &&
sudo apt-get update -qq sudo apt-get update -qq
; fi ; fi
@ -27,7 +31,7 @@ install:
; fi ; fi
after_success: after_success:
# TODO: include radare2/www for the webserver # TODO: include radare2/www for the webserver # Unless we remove the webserver ;)
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
macdeployqt cutter.app -dmg && macdeployqt cutter.app -dmg &&
export FILE_TO_UPLOAD="cutter.dmg" export FILE_TO_UPLOAD="cutter.dmg"
@ -55,10 +59,6 @@ before_script:
fi fi
- cd .. - cd ..
env:
- TEST_COMMAND="qmake PREFIX=/usr APPIMAGE=1 ../src && make -j4"
- TEST_COMMAND="cmake ../src && make -j4"
script: script:
- mkdir build - mkdir build
- cd build - cd build