Explicitly use Ubuntu Xenial on Travis CI [appveyor skip]
parent
11efdcf4a3
commit
86be352070
|
@ -8,7 +8,10 @@ jobs:
|
||||||
- stage: Unit tests
|
- stage: Unit tests
|
||||||
name: Linux (gcc 6)
|
name: Linux (gcc 6)
|
||||||
os: linux
|
os: linux
|
||||||
|
dist: xenial
|
||||||
env: COMPILER=g++-6
|
env: COMPILER=g++-6
|
||||||
|
services:
|
||||||
|
- xvfb
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
|
@ -17,6 +20,7 @@ jobs:
|
||||||
- g++-6
|
- g++-6
|
||||||
- libudev-dev
|
- libudev-dev
|
||||||
- libxrandr-dev
|
- libxrandr-dev
|
||||||
|
- libgl1-mesa-dev
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/SFML-2.5.0_LINUX
|
- $HOME/SFML-2.5.0_LINUX
|
||||||
|
@ -28,6 +32,7 @@ jobs:
|
||||||
- stage: Cross-platform tests
|
- stage: Cross-platform tests
|
||||||
name: Linux (gcc 4.9)
|
name: Linux (gcc 4.9)
|
||||||
os: linux
|
os: linux
|
||||||
|
dist: xenial
|
||||||
env: COMPILER=g++-4.9
|
env: COMPILER=g++-4.9
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
|
@ -37,6 +42,7 @@ jobs:
|
||||||
- g++-4.9
|
- g++-4.9
|
||||||
- libudev-dev
|
- libudev-dev
|
||||||
- libxrandr-dev
|
- libxrandr-dev
|
||||||
|
- libgl1-mesa-dev
|
||||||
cache:
|
cache:
|
||||||
ccache: true
|
ccache: true
|
||||||
directories:
|
directories:
|
||||||
|
|
|
@ -3,8 +3,6 @@ set -eo pipefail
|
||||||
export SFML_VERSION=2.5.0
|
export SFML_VERSION=2.5.0
|
||||||
export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX
|
export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX
|
||||||
export BUILD_FOLDER=build_$CXX
|
export BUILD_FOLDER=build_$CXX
|
||||||
export DISPLAY=:99.0
|
|
||||||
sh -e /etc/init.d/xvfb start
|
|
||||||
|
|
||||||
if [[ ! -d "$SFML_ROOT/lib" ]]; then
|
if [[ ! -d "$SFML_ROOT/lib" ]]; then
|
||||||
echo "$(tput setaf 3)Rebuilding SFML: no cache available$(tput sgr 0)"
|
echo "$(tput setaf 3)Rebuilding SFML: no cache available$(tput sgr 0)"
|
||||||
|
|
Loading…
Reference in New Issue