travis: Use GCC 6 on Ubuntu CI builds
This commit is contained in:
parent
c283a8509d
commit
a81b9ca689
3 changed files with 6 additions and 6 deletions
|
@ -11,8 +11,8 @@ fi
|
||||||
|
|
||||||
#if OS is linux or is not set
|
#if OS is linux or is not set
|
||||||
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
||||||
export CC=gcc-5
|
export CC=gcc-6
|
||||||
export CXX=g++-5
|
export CXX=g++-6
|
||||||
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
|
|
|
@ -5,8 +5,8 @@ set -x
|
||||||
|
|
||||||
#if OS is linux or is not set
|
#if OS is linux or is not set
|
||||||
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
||||||
export CC=gcc-5
|
export CC=gcc-6
|
||||||
export CXX=g++-5
|
export CXX=g++-6
|
||||||
mkdir -p $HOME/.local
|
mkdir -p $HOME/.local
|
||||||
|
|
||||||
curl -L http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-i386.tar.gz \
|
curl -L http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-i386.tar.gz \
|
||||||
|
|
|
@ -17,8 +17,8 @@ addons:
|
||||||
sources:
|
sources:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
packages:
|
packages:
|
||||||
- gcc-5
|
- gcc-6
|
||||||
- g++-5
|
- g++-6
|
||||||
- qt5-default
|
- qt5-default
|
||||||
- libqt5opengl5-dev
|
- libqt5opengl5-dev
|
||||||
- xorg-dev
|
- xorg-dev
|
||||||
|
|
Loading…
Reference in a new issue