From bffec3d8f2c27c99190bca1a2ffd9cc03da7ede0 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Wed, 23 Oct 2019 00:18:19 +0200
Subject: [PATCH] travis: update to bionic

Now we don't have to build xcb-xrm ourselves since it's available in the
repos
---
 .travis.yml                      | 11 ++---------
 common/travis/install_xcb_xrm.sh | 26 --------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100755 common/travis/install_xcb_xrm.sh

diff --git a/.travis.yml b/.travis.yml
index fcd11c1d..a6c3c48f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: xenial
+dist: bionic
 language: cpp
 
 env:
@@ -26,6 +26,7 @@ addons:
       - &optional_deps
         - libxcb-xkb-dev
         - libxcb-cursor-dev
+        - libxcb-xrm-dev
         - libxcb1-dev
         - xutils-dev
         - i3-wm
@@ -50,7 +51,6 @@ matrix:
         - cmake ..
       script: make doc
       # Disable unnecessary commands
-      install:
       cache:
 
     - compiler: clang
@@ -79,13 +79,6 @@ matrix:
 cache:
   ccache: true
   apt: true
-  directories:
-    - ${TRAVIS_BUILD_DIR}/deps/xcb-util-xrm
-
-install:
-  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
-  - mkdir -p "${DEPS_DIR}" && cd "${DEPS_DIR}"
-  - source ${TRAVIS_BUILD_DIR}/common/travis/install_xcb_xrm.sh
 
 before_script:
   - source ${TRAVIS_BUILD_DIR}/common/travis/summary.sh
diff --git a/common/travis/install_xcb_xrm.sh b/common/travis/install_xcb_xrm.sh
deleted file mode 100755
index 455fcc98..00000000
--- a/common/travis/install_xcb_xrm.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Don't install xrm on minimal builds because it is an optional dependency
-if [ "$POLYBAR_BUILD_TYPE" == "minimal" ]; then
-  echo "Not installing xcb-xrm on minimal build"
-  return 0
-fi
-
-# Fail on error
-set -e
-
-# If the Makefile exists, we have already cached xrm
-if [ ! -e "${DEPS_DIR}/xcb-util-xrm/Makefile" ]; then
-  git clone --recursive https://github.com/Airblader/xcb-util-xrm
-fi
-
-cd xcb-util-xrm
-
-# Install xrm on the system
-# If that doesn't work for some reason (not yet compiled, corrupt cache)
-# we compile xrm and try to install it again
-sudo make install || {
-  ./autogen.sh --prefix=/usr --libdir=/usr/lib
-  make
-  sudo make install
-}