diff options
author | kain88-de <kain88-de@users.noreply.github.com> | 2015-01-28 11:20:20 +0100 |
---|---|---|
committer | kain88-de <kain88-de@users.noreply.github.com> | 2015-01-28 11:20:20 +0100 |
commit | 9f7da555fc714c4a88ea3311f0f721d946097b2d (patch) | |
tree | fc68eed65f1a58b377e26bead7a64043e809b700 /.travis.yml | |
parent | 060f6b083ed493b88e50a477a94a3fdc36dac48a (diff) |
Update .travis.yml
Use clang and GCC to build and test mixxx. It is also a recommended practice for Travis to update the virtual machine on every run.
I also changed the scons options to the ones we use on the jenkins build server. It mainly concerns some plugins that are disabled in the default settings.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 73a33e5148..f69ac82d28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,17 @@ language: c++ -# command to install dependencies +# to run compilation/tests with gcc and clang +compiler: + - gcc + - clang before_install: + # update virtual machine + - sudo apt-get update -qq # Dependencies from <http://mixxx.org/wiki/doku.php/compiling_on_linux> - sudo apt-get install git scons libqt4-dev libqt4-sql-sqlite libportmidi-dev libshout3-dev libtag1-dev libprotobuf-dev protobuf-compiler libvamp-hostsdk3 vamp-plugin-sdk libusb-1.0-0-dev libfftw3-dev libmad0-dev portaudio19-dev libchromaprint-dev librubberband-dev libsqlite3-dev libsndfile1-dev libflac-dev libid3tag0-dev - # Virtual X + # Virtual X, needed for analyser waveform tests - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" install: - - scons - - scons test=1 + - scons test=1 mad=1 opus=1 localecompare=1 script: - # `scons test` can't connect to X server for some reason - ./mixxx-test |