Travis: update to use clang 6.0, build on one thread

Compiling on Linux Debug fails with what may be an out of memory for
clang. Limit the number of jobs to try and avoid OOM.
This commit is contained in:
Corentin Wallez 2018-08-08 16:54:05 +02:00 committed by Corentin Wallez
parent de4dbc3cf7
commit ac986030b9

View File

@ -26,15 +26,15 @@ addons:
# Everything under apt is only used on linux # Everything under apt is only used on linux
apt: apt:
sources: sources:
# PPA for clang 5.0 # PPA for clang 6.0
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-6.0
# PPA for clang-format 7 # PPA for clang-format 7
- llvm-toolchain-trusty - llvm-toolchain-trusty
# PPA for a more recen libstdc++ # PPA for a more recen libstdc++
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
# Get recent compilers # Get recent compilers
- clang-5.0 - clang-6.0
# Pull a recent version of libstdc++ # Pull a recent version of libstdc++
- libstdc++-6-dev - libstdc++-6-dev
# Ninja builds are faster # Ninja builds are faster
@ -56,14 +56,14 @@ install:
script: script:
# Use the more recent compilers we just installed # Use the more recent compilers we just installed
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$CXX" == "clang++" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$CXX" == "clang++" ]; then export CXX="clang++-6.0" CC="clang-6.0"; fi
# Build # Build
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake --version - cmake --version
- cmake -G "Ninja" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDAWN_USE_WERROR=1 .. - cmake -G "Ninja" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDAWN_USE_WERROR=1 ..
- cmake --build . - cmake --build . -- -j 1
# Test # Test
- ./dawn_unittests - ./dawn_unittests