summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorStéphane Lepin <stephane.lepin@gmail.com>2017-08-04 22:47:18 +0200
committerStéphane Lepin <stephane.lepin@gmail.com>2017-08-04 22:47:18 +0200
commitfdf307823c9f27373d67d93a80e6c15cde94b126 (patch)
tree830aa9731d06252462c33f057a1fac6dc8f85a1d /.travis.yml
parentf4c684655c3f60781e78068dbeaebd1e4a4c1be4 (diff)
CI: disable qtkeychain dependency in Travis OS X
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index fb32323232..24f6870a3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,15 +51,13 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg libjpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; fi
- # Install QtKeychain
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap owncloud/homebrew-owncloud; brew install qtkeychain; fi
install:
####
# Common
# Build flags common to OS X and Linux.
- - export COMMON="test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 qtkeychain=1"
+ - export COMMON="test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1"
#####
# Ubuntu Trusty Build