fix(ci): Installpackages using the apt addon

This commit is contained in:
Michael Carlberg 2016-12-15 19:16:31 +01:00
parent 6ce1c9805e
commit 32fb7ad9bb
2 changed files with 18 additions and 24 deletions

View File

@ -11,10 +11,28 @@ addons:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
- sourceline: "ppa:george-edison55/george-edison"
packages: packages:
- gcc-5 - gcc-5
- g++-5 - g++-5
- clang-3.8 - clang-3.8
- cmake
- cmake-data
- i3-wm
- libasound2-dev
- libboost-dev
- libfreetype6-dev
- libiw-dev
- libmpdclient-dev
- libxcb-ewmh-dev
- libxcb-icccm4-dev
- libxcb-image0-dev
- libxcb-randr0-dev
- libxcb-util0-dev
- libxcb-xkb-dev
- libxcb1-dev
- python-xcbgen
- xcb-proto
env: env:
global: global:
@ -35,7 +53,6 @@ cache:
install: install:
- source ${TRAVIS_BUILD_DIR}/common/travis/environment.sh - source ${TRAVIS_BUILD_DIR}/common/travis/environment.sh
- source ${TRAVIS_BUILD_DIR}/common/travis/install_deps.sh
- source ${TRAVIS_BUILD_DIR}/common/travis/install_cmake.sh - source ${TRAVIS_BUILD_DIR}/common/travis/install_cmake.sh
- source ${TRAVIS_BUILD_DIR}/common/travis/install_libcpp.sh - source ${TRAVIS_BUILD_DIR}/common/travis/install_libcpp.sh

View File

@ -1,23 +0,0 @@
#!/bin/sh
sudo apt-add-repository -y "ppa:george-edison55/george-edison"
sudo apt-get -qq update
sudo apt-get install -y \
cmake cmake-data \
libboost-dev \
libxcb1-dev \
libxcb-ewmh-dev \
libxcb-icccm4-dev \
libxcb-image0-dev \
libxcb-randr0-dev \
libxcb-util0-dev \
libxcb-xkb-dev \
xcb-proto \
python-xcbgen \
libfreetype6-dev
# optdepends
sudo apt-get install -y \
i3-wm \
libiw-dev \
libasound2-dev \
libmpdclient-dev