diff --git a/doc/building.dox b/doc/building.dox index 908db69f9..0cb17af46 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -992,7 +992,7 @@ for Android. @subsection building-ci-travis Travis -In `package/ci/` there is a `travis.yml` file with Linux GCC 4.7, macOS, Linux +In `package/ci/` there is a `travis.yml` file with Linux GCC 4.8, macOS, Linux desktop GLES2/GLES3, iOS GLES2/GLES3, Emscripten WebGL1/WebGL2, Android GLES2/GLES3, AddressSanitizer and ThreadSanitizer configuration. Online at https://travis-ci.org/mosra/magnum. diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 3a6fa6e7d..71be410c1 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -4,7 +4,7 @@ addons: apt: packages: - libgl1-mesa-dev - - g++-4.7 + - g++-4.8 - ninja-build - lcov - "libc6:i386" # CMake 2.8.12 is 32bit @@ -27,7 +27,7 @@ matrix: - JOBID=linux-gl - TARGET=desktop - CMAKE_CXX_FLAGS="--coverage" - - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7" + - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - language: cpp os: linux dist: trusty @@ -81,7 +81,7 @@ matrix: - TARGET=desktop-gles - TARGET_GLES2=ON - CMAKE_CXX_FLAGS="--coverage" - - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7" + - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - language: cpp os: linux dist: trusty @@ -91,7 +91,7 @@ matrix: - TARGET=desktop-gles - TARGET_GLES2=OFF - CMAKE_CXX_FLAGS="--coverage" - - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7" + - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - language: cpp os: osx # The new plugin testing workflow is dynamically loading and unloading them @@ -183,7 +183,7 @@ cache: - $HOME/cmake install: -- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.7; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.8; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-sanitizers" ]; then export CXX=clang++-3.8; fi - if [ "$BUILD_DEPRECATED" != "OFF" ]; then export BUILD_DEPRECATED=ON; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop" ] && [ "$BUILD_DEPRECATED" == "ON" ]; then export WITH_GLUTAPPLICATION=ON; fi