From: Daniel Albers <daniel@lbe.rs>
Date: Tue, 5 Jul 2016 19:16:48 +0000 (+0200)
Subject: Slightly reorder travis config
X-Git-Tag: 0.12.5~102
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=705a60135089bb8ccc679f42c954b9584a00a51d

Slightly reorder travis config

(cherry picked from commit 5091c3c6443e4693ee5ac0e6bbeac6d9fc2cb48c)
---

diff --git a/.travis.yml b/.travis.yml
index fe824dd2..70a55f26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,10 @@
 os:
-  - osx
   - linux
+  - osx
 
 sudo: required
 dist: trusty
 
-install: |-
-  if [ "$TRAVIS_OS_NAME" == "osx" ]
-  then
-    brew update
-    brew install ninja qt5
-  fi
-  if [ "$TRAVIS_OS_NAME" == "linux" ]
-  then
-    sudo apt-get -qy install libqt5webkit5-dev qttools5-dev qtscript5-dev
-    sudo apt-get -qy install libdbusmenu-qt-dev libdbusmenu-qt5-dev
-    sudo apt-get -qy install libphonon-dev libphonon4qt5-dev
-    sudo apt-get -qy install libqca2-dev
-    sudo apt-get -qy install qt4-dev-tools qttools5-dev-tools
-    sudo apt-get -qy install libphonon4qt5experimental4 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=805096
-  fi
-
 language: cpp
 cache: ccache
 
@@ -32,20 +16,6 @@ env:
   - QT_VERSION=qt4
   - QT_VERSION=qt5
 
-script: |-
-  mkdir build
-  cd build
-  if [ "$TRAVIS_OS_NAME" == "osx" ]
-  then
-    cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DUSE_QT5=ON -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5
-    ninja install
-  elif [ "$TRAVIS_OS_NAME" == "linux" ]
-  then
-    if [ "$QT_VERSION" = "qt4" ]; then cmake ..; fi
-    if [ "$QT_VERSION" = "qt5" ]; then cmake -DUSE_QT5=ON ..; fi
-    make
-  fi
-
 matrix:
   exclude:
     - compiler: clang
@@ -54,3 +24,32 @@ matrix:
       compiler: clang
     - os: osx
       env: QT_VERSION=qt4
+
+install: |-
+  if [ "$TRAVIS_OS_NAME" == "linux" ]
+  then
+    sudo apt-get -qy install libqt5webkit5-dev qttools5-dev qtscript5-dev
+    sudo apt-get -qy install libdbusmenu-qt-dev libdbusmenu-qt5-dev
+    sudo apt-get -qy install libphonon-dev libphonon4qt5-dev
+    sudo apt-get -qy install libqca2-dev
+    sudo apt-get -qy install qt4-dev-tools qttools5-dev-tools
+    sudo apt-get -qy install libphonon4qt5experimental4 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=805096
+  elif [ "$TRAVIS_OS_NAME" == "osx" ]
+  then
+    brew update
+    brew install ninja qt5
+  fi
+
+script: |-
+  mkdir build
+  cd build
+  if [ "$TRAVIS_OS_NAME" == "linux" ]
+  then
+    if [ "$QT_VERSION" = "qt4" ]; then cmake ..; fi
+    if [ "$QT_VERSION" = "qt5" ]; then cmake -DUSE_QT5=ON ..; fi
+    make
+  elif [ "$TRAVIS_OS_NAME" == "osx" ]
+  then
+    cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DUSE_QT5=ON -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5
+    ninja install
+  fi