diff options
| author | 2016-06-17 09:10:34 -0400 | |
|---|---|---|
| committer | 2016-06-17 10:48:40 -0400 | |
| commit | a81b9ca6894e5117f48831aa23d2a028bbb29719 (patch) | |
| tree | 042940b6d34dfb41badf606d65447e8d8e26ed81 | |
| parent | travis: Use Qt 5 on Ubuntu CI builds (diff) | |
| download | yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.gz yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.tar.xz yuzu-a81b9ca6894e5117f48831aa23d2a028bbb29719.zip | |
travis: Use GCC 6 on Ubuntu CI builds
Diffstat (limited to '')
| -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 | |||
| 11 | 11 | ||
| 12 | #if OS is linux or is not set | 12 | #if OS is linux or is not set |
| 13 | if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | 13 | if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then |
| 14 | export CC=gcc-5 | 14 | export CC=gcc-6 |
| 15 | export CXX=g++-5 | 15 | export CXX=g++-6 |
| 16 | export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH | 16 | export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH |
| 17 | 17 | ||
| 18 | mkdir build && cd build | 18 | 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 | |||
| 5 | 5 | ||
| 6 | #if OS is linux or is not set | 6 | #if OS is linux or is not set |
| 7 | if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | 7 | if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then |
| 8 | export CC=gcc-5 | 8 | export CC=gcc-6 |
| 9 | export CXX=g++-5 | 9 | export CXX=g++-6 |
| 10 | mkdir -p $HOME/.local | 10 | mkdir -p $HOME/.local |
| 11 | 11 | ||
| 12 | curl -L http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-i386.tar.gz \ | 12 | 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: | |||
| 17 | sources: | 17 | sources: |
| 18 | - ubuntu-toolchain-r-test | 18 | - ubuntu-toolchain-r-test |
| 19 | packages: | 19 | packages: |
| 20 | - gcc-5 | 20 | - gcc-6 |
| 21 | - g++-5 | 21 | - g++-6 |
| 22 | - qt5-default | 22 | - qt5-default |
| 23 | - libqt5opengl5-dev | 23 | - libqt5opengl5-dev |
| 24 | - xorg-dev | 24 | - xorg-dev |