Explicitly use Ubuntu Xenial on Travis CI [appveyor skip]

0.8
Bruno Van de Velde 2019-04-15 19:35:45 +02:00
parent 11efdcf4a3
commit 86be352070
2 changed files with 6 additions and 2 deletions

View File

@ -8,7 +8,10 @@ jobs:
- stage: Unit tests
name: Linux (gcc 6)
os: linux
dist: xenial
env: COMPILER=g++-6
services:
- xvfb
addons:
apt:
sources:
@ -17,6 +20,7 @@ jobs:
- g++-6
- libudev-dev
- libxrandr-dev
- libgl1-mesa-dev
cache:
directories:
- $HOME/SFML-2.5.0_LINUX
@ -28,6 +32,7 @@ jobs:
- stage: Cross-platform tests
name: Linux (gcc 4.9)
os: linux
dist: xenial
env: COMPILER=g++-4.9
addons:
apt:
@ -37,6 +42,7 @@ jobs:
- g++-4.9
- libudev-dev
- libxrandr-dev
- libgl1-mesa-dev
cache:
ccache: true
directories:

View File

@ -3,8 +3,6 @@ set -eo pipefail
export SFML_VERSION=2.5.0
export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX
export BUILD_FOLDER=build_$CXX
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
if [[ ! -d "$SFML_ROOT/lib" ]]; then
echo "$(tput setaf 3)Rebuilding SFML: no cache available$(tput sgr 0)"