From ea5fc22c7d43d7f4d25855124b275159f43c3371 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Sun, 23 Dec 2018 23:14:55 +0100
Subject: [PATCH] travis: Upgrade to xenial

This travis environment contains more up-to-date versions of clang and
gcc (namely 7.0.0 and 5.4.0). This allows us to remove all the code used
to get those newer versions in trusty.

Ref: https://docs.travis-ci.com/user/reference/xenial/
---
 .travis.yml                  | 18 +++++-------------
 common/travis/environment.sh |  8 --------
 2 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100755 common/travis/environment.sh

diff --git a/.travis.yml b/.travis.yml
index f618c1e6..ffaf579e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: cpp
 
 env:
@@ -13,14 +13,7 @@ env:
 # install
 addons:
   apt:
-    sources: &sources
-      - ubuntu-toolchain-r-test
     packages:
-      - &gcc
-        - g++-5
-        - gcc-5
-      - &clang
-        - libstdc++-5-dev
       - &base_deps
         - libxcb-composite0-dev
         - libxcb-ewmh-dev
@@ -48,11 +41,11 @@ matrix:
   include:
     - compiler: clang
       env: BUILD_TYPE=Release
-      addons: {apt: {sources: *sources, packages: [*clang, *base_deps, *optional_deps]}}
+      addons: {apt: {packages: [*base_deps, *optional_deps]}}
 
     - compiler: gcc
       env: BUILD_TYPE=Coverage POLYBAR_BUILD_TYPE=tests BUILD_TESTS=ON
-      addons: {apt: {sources: *sources, packages: [*gcc, *base_deps, *optional_deps]}}
+      addons: {apt: {packages: [*base_deps, *optional_deps]}}
       script: ${TRAVIS_BUILD_DIR}/common/travis/tests.sh
       after_success:
         - cd ${TRAVIS_BUILD_DIR}
@@ -60,14 +53,14 @@ matrix:
 
     - compiler: gcc
       env: BUILD_TYPE=Release
-      addons: {apt: {sources: *sources, packages: [*gcc, *base_deps, *optional_deps]}}
+      addons: {apt: {packages: [*base_deps, *optional_deps]}}
 
       # Minimal build, contains no optional dependencies. This makes sure that
       # we properly remove files from compilation that depend on libraries that
       # are not installed
     - compiler: gcc
       env: BUILD_TYPE=Release POLYBAR_BUILD_TYPE=minimal
-      addons: {apt: {sources: *sources, packages: [*gcc, *base_deps]}}
+      addons: {apt: {packages: [*base_deps]}}
 
 cache:
   ccache: true
@@ -78,7 +71,6 @@ cache:
 install:
   - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
   - mkdir -p "${DEPS_DIR}" && cd "${DEPS_DIR}"
-  - source ${TRAVIS_BUILD_DIR}/common/travis/environment.sh
   - source ${TRAVIS_BUILD_DIR}/common/travis/install_xcb_xrm.sh
 
 before_script:
diff --git a/common/travis/environment.sh b/common/travis/environment.sh
deleted file mode 100755
index 50398186..00000000
--- a/common/travis/environment.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Update compiler flags
-if [ "${CXX}" = "clang++" ]; then
-  export CXXFLAGS="${CXXFLAGS} -Qunused-arguments"
-elif [ "${CXX}" = "g++" ]; then
-  export CXX="g++-5"
-  export CC="gcc-5"
-fi