summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2019-12-09 23:11:27 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2019-12-09 23:17:26 +0100
commita8f50e8605ef407ec696c8482f127d3689d80131 (patch)
treed8b975f61db44904eab685e5f8f36b604e6694ee /.travis.yml
parent22a9111566ec765ae3b615cd381dfd9ba4d0e74b (diff)
.travis.yml: Remove scons from global depencency lists
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 2d042c22ce..2fe7cd8af5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ jobs:
compiler: gcc
# Ubuntu Xenial build prerequisites
env: SCONS_MIXXX_EXTRA_FLAGS="localecompare=1"
+ before_install:
+ - sudo apt-get install -y scons
install:
- scons $SCONS_MIXXX_COMMON_FLAGS $SCONS_MIXX_EXTRA_FLAGS
script:
@@ -52,6 +54,7 @@ jobs:
CXXFLAGS="-isystem /usr/local/include/opus"
DISPLAY=:99.0
before_install:
+ - brew install scons
- export QTDIR="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)"
- echo "QTDIR=$QTDIR"
install:
@@ -105,7 +108,6 @@ addons:
- qt5-default
- qtscript5-dev
- qt5keychain-dev
- - scons
homebrew:
update: true
packages:
@@ -129,7 +131,6 @@ addons:
- protobuf
- qt5
- rubberband
- - scons
- sound-touch
- taglib
- wavpack