diff --git a/.travis.yml b/.travis.yml index f5d777dd7..bbd600671 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,16 +15,16 @@ matrix: - os: osx before_install: - - bash ./.travis/before_install.sh + - source ./.travis/before_install.sh install: - - bash ./.travis/install.sh + - source ./.travis/install.sh script: - - bash ./.travis/script.sh + - source ./.travis/script.sh after_success: - - bash ./.travis/after_success.sh + - source ./.travis/after_success.sh branches: except: diff --git a/.travis/before_install.sh b/.travis/before_install.sh index e117fc6d2..a9312b90e 100644 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -1,7 +1,7 @@ #!/bin/bash if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - brew install ffmpeg qt5 + # do nothing elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y