travis: update to bionic

Now we don't have to build xcb-xrm ourselves since it's available in the
repos
This commit is contained in:
patrick96 2019-10-23 00:18:19 +02:00 committed by Patrick Ziegler
parent 2b31a3f112
commit bffec3d8f2
2 changed files with 2 additions and 35 deletions

View File

@ -1,5 +1,5 @@
sudo: required sudo: required
dist: xenial dist: bionic
language: cpp language: cpp
env: env:
@ -26,6 +26,7 @@ addons:
- &optional_deps - &optional_deps
- libxcb-xkb-dev - libxcb-xkb-dev
- libxcb-cursor-dev - libxcb-cursor-dev
- libxcb-xrm-dev
- libxcb1-dev - libxcb1-dev
- xutils-dev - xutils-dev
- i3-wm - i3-wm
@ -50,7 +51,6 @@ matrix:
- cmake .. - cmake ..
script: make doc script: make doc
# Disable unnecessary commands # Disable unnecessary commands
install:
cache: cache:
- compiler: clang - compiler: clang
@ -79,13 +79,6 @@ matrix:
cache: cache:
ccache: true ccache: true
apt: 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: before_script:
- source ${TRAVIS_BUILD_DIR}/common/travis/summary.sh - source ${TRAVIS_BUILD_DIR}/common/travis/summary.sh

View File

@ -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
}