diff options
| author | Lioncash <mathew1800@gmail.com> | 2016-06-17 15:10:34 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2016-06-17 16:48:40 +0200 |
| commit | a81b9ca6894e5117f48831aa23d2a028bbb29719 (patch) | |
| tree | 042940b6d34dfb41badf606d65447e8d8e26ed81 | |
| parent | travis: Use Qt 5 on Ubuntu CI builds (diff) | |
| download | yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.gz yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.bz2 yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.lz yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.xz yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.zst yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.zip | |
| -rwxr-xr-x | .travis-build.sh | 4 | ||||
| -rwxr-xr-x | .travis-deps.sh | 4 | ||||
| -rw-r--r-- | .travis.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 9e9c59b7d..8440b4f5c 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -11,8 +11,8 @@ fi #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then - export CC=gcc-5 - export CXX=g++-5 + export CC=gcc-6 + export CXX=g++-6 export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH mkdir build && cd build diff --git a/.travis-deps.sh b/.travis-deps.sh index 4a79feb70..10b69f5c4 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -5,8 +5,8 @@ set -x #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then - export CC=gcc-5 - export CXX=g++-5 + export CC=gcc-6 + export CXX=g++-6 mkdir -p $HOME/.local curl -L http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-i386.tar.gz \ diff --git a/.travis.yml b/.travis.yml index 06c00a162..8be395770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - gcc-5 - - g++-5 + - gcc-6 + - g++-6 - qt5-default - libqt5opengl5-dev - xorg-dev |