1
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2024-12-09 14:10:19 -05:00

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/
This commit is contained in:
patrick96 2018-12-23 23:14:55 +01:00 committed by Patrick Ziegler
parent fe0b072dd0
commit ea5fc22c7d
2 changed files with 5 additions and 21 deletions

View file

@ -1,5 +1,5 @@
sudo: required sudo: required
dist: trusty dist: xenial
language: cpp language: cpp
env: env:
@ -13,14 +13,7 @@ env:
# install # install
addons: addons:
apt: apt:
sources: &sources
- ubuntu-toolchain-r-test
packages: packages:
- &gcc
- g++-5
- gcc-5
- &clang
- libstdc++-5-dev
- &base_deps - &base_deps
- libxcb-composite0-dev - libxcb-composite0-dev
- libxcb-ewmh-dev - libxcb-ewmh-dev
@ -48,11 +41,11 @@ matrix:
include: include:
- compiler: clang - compiler: clang
env: BUILD_TYPE=Release env: BUILD_TYPE=Release
addons: {apt: {sources: *sources, packages: [*clang, *base_deps, *optional_deps]}} addons: {apt: {packages: [*base_deps, *optional_deps]}}
- compiler: gcc - compiler: gcc
env: BUILD_TYPE=Coverage POLYBAR_BUILD_TYPE=tests BUILD_TESTS=ON 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 script: ${TRAVIS_BUILD_DIR}/common/travis/tests.sh
after_success: after_success:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
@ -60,14 +53,14 @@ matrix:
- compiler: gcc - compiler: gcc
env: BUILD_TYPE=Release 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 # Minimal build, contains no optional dependencies. This makes sure that
# we properly remove files from compilation that depend on libraries that # we properly remove files from compilation that depend on libraries that
# are not installed # are not installed
- compiler: gcc - compiler: gcc
env: BUILD_TYPE=Release POLYBAR_BUILD_TYPE=minimal env: BUILD_TYPE=Release POLYBAR_BUILD_TYPE=minimal
addons: {apt: {sources: *sources, packages: [*gcc, *base_deps]}} addons: {apt: {packages: [*base_deps]}}
cache: cache:
ccache: true ccache: true
@ -78,7 +71,6 @@ cache:
install: install:
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
- mkdir -p "${DEPS_DIR}" && cd "${DEPS_DIR}" - 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 - source ${TRAVIS_BUILD_DIR}/common/travis/install_xcb_xrm.sh
before_script: before_script:

View file

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