From 8c2a7d0b5860b095bc1c4e24ea5d01bed311b28d Mon Sep 17 00:00:00 2001 From: baydam Date: Thu, 22 Mar 2018 12:24:52 +0000 Subject: [PATCH] Update travis config file --- .travis.yml | 63 ++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c0598c..c0005c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,36 +1,39 @@ - - os: linux - dist: trusty - sudo: required - env: TARGET="linux64" +language: c++ +compiler: gcc - install: - - sudo apt-get update - # Qt - - sudo apt-get install qt5-default qttools5-dev-tools - # Liblo - - sudo apt-get install liblo-dev liblo-tools - # GStreamer - - sudo apt-get install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-vaapi gstreamer1.0-plugins-base gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gstreamer1.0-tools - # QtMultimedia (unused) - - sudo apt-get install qtmultimedia5-dev +matrix: + include: + - os: linux + dist: trusty + env: TARGET="linux64" - script: - - qmake mapmap.pro - - make + - os: osx + osx_image: xcode8 + env: TARGET="osx" - - os: osx - osx_image: xcode8 - compiler: gcc - env: TARGET="osx" +before_install: + - if [ "$TARGET" == "linux64" ]; then + sudo apt-get update + fi - before_install: - - brew update && brew bundle + - if [ "$TARGET" == "osx" ]; then + brew update && brew bundle + fi - install: - - brew install qt - - brew install liblo - - brew install gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good gst-libav +install: + - if [ "$TARGET" == "linux64" ]; then + sudo apt-get install qt5-default qttools5-dev-tools + sudo apt-get install liblo-dev liblo-tools + sudo apt-get install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-vaapi gstreamer1.0-plugins-base gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gstreamer1.0-tools + sudo apt-get install qtmultimedia5-dev + fi - script: - - qmake mapmap.pro - - make + - if [ "$TARGET" == "linux64" ]; then + brew install qt + brew install liblo + brew install gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good gst-libav + fi + +script: + - qmake mapmap.pro + - make