From 55029b6b685b14b97795720f309ad25b7d15ff01 Mon Sep 17 00:00:00 2001
From: ctrlaltca <ctrlaltca@gmail.com>
Date: Sat, 20 Jan 2018 16:50:06 +0100
Subject: [PATCH] Travis: remove sudo (#3037)

---
 .travis.yml                    | 37 ++++++++++++++++++++++++++++------
 .travis/travis-dependencies.sh | 26 +-----------------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9debf4c8..164e32df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,3 @@
-sudo: required   # forces legacy build infrastructure
-group: travis_lts   # forces most stable build images
-
 language: cpp
 
 matrix:
@@ -8,10 +5,38 @@ matrix:
   include:
   - os: linux
     dist: trusty
-    env: BUILDTYPE=Debug DIST=trusty
+    env: BUILDTYPE=Debug
+    addons:
+      apt:
+        packages:
+        - bc
+        - cmake  
+        - libprotobuf-dev
+        - protobuf-compiler
+        - qt5-default
+        - qttools5-dev
+        - qttools5-dev-tools
+        - qtmultimedia5-dev
+        - libqt5multimedia5-plugins
+        - libqt5svg5-dev
+        - libqt5sql5-mysql
   - os: linux
     dist: trusty
-    env: BUILDTYPE=Release DIST=trusty
+    env: BUILDTYPE=Release
+    addons:
+      apt:
+        packages:
+        - bc
+        - cmake  
+        - libprotobuf-dev
+        - protobuf-compiler
+        - qt5-default
+        - qttools5-dev
+        - qttools5-dev-tools
+        - qtmultimedia5-dev
+        - libqt5multimedia5-plugins
+        - libqt5svg5-dev
+        - libqt5sql5-mysql
   - os: osx
     osx_image: xcode7.3
     env: BUILDTYPE=Debug
@@ -31,7 +56,7 @@ matrix:
 
 cache: ccache
 
-install: bash ./.travis/travis-dependencies.sh
+before_install: bash ./.travis/travis-dependencies.sh
 
 script: bash ./.travis/travis-compile.sh
 
diff --git a/.travis/travis-dependencies.sh b/.travis/travis-dependencies.sh
index d59c0b18..e00068e4 100755
--- a/.travis/travis-dependencies.sh
+++ b/.travis/travis-dependencies.sh
@@ -4,28 +4,4 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
   brew install ccache   # enable caching on mac (PATH only set in travis-compile.sh)
   brew install --force qt@5.7
   brew install protobuf
-else
-  # common prerequisites
-  sudo add-apt-repository -y ppa:smspillaz/cmake-master
-  sudo apt-get update -qq
-  sudo apt-get -y purge cmake
-  sudo apt-get install -y \
-    libprotobuf-dev protobuf-compiler \
-    cmake \
-    bc \
-    qt5-default qttools5-dev qttools5-dev-tools \
-    qtmultimedia5-dev libqt5multimedia5-plugins libqt5svg5-dev libqt5sql5-mysql
-
-  # prerequisites for tests
-  if [[ $BUILDTYPE == "Debug" ]]; then
-    sudo apt-get install -y libgtest-dev
-
-    sudo mkdir /usr/src/gtest/build
-    cd /usr/src/gtest/build
-    sudo cmake .. -DBUILD_SHARED_LIBS=1
-    sudo make -j2
-    sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
-    sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so
-    cd -
-  fi
-fi
+fi
\ No newline at end of file