Commit 209b82d9 authored by Kenton Varda's avatar Kenton Varda

Try again with Travis.

parent 0117595a
...@@ -12,7 +12,8 @@ addons: ...@@ -12,7 +12,8 @@ addons:
- autoconf - autoconf
- libtool - libtool
- pkg-config - pkg-config
script: ./super-test.sh -j2 quick # limit parallelism due to limited memory on Travis # limit parallelism due to limited memory on Travis
script: CC=$MATRIX_CC CXX=$MATRIX_CXX ./super-test.sh -j2 quick
matrix: matrix:
include: include:
...@@ -25,7 +26,8 @@ matrix: ...@@ -25,7 +26,8 @@ matrix:
packages: packages:
- g++-4.9 - g++-4.9
env: env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - MATRIX_CC=gcc-4.9
- MATRIX_CXX=g++-4.9
# New GCC # New GCC
- os: linux - os: linux
...@@ -36,7 +38,8 @@ matrix: ...@@ -36,7 +38,8 @@ matrix:
packages: packages:
- g++-7 - g++-7
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_CC=gcc-7
- MATRIX_CXX=g++-7
# Old Clang # Old Clang
- os: linux - os: linux
...@@ -44,11 +47,12 @@ matrix: ...@@ -44,11 +47,12 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6 - llvm-toolchain-trusty-3.6
packages: packages:
- clang-3.6 - clang-3.6
env: env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - MATRIX_CC=clang-3.6
- MATRIX_CXX=clang++-3.6
# New Clang # New Clang
- os: linux - os: linux
...@@ -56,15 +60,17 @@ matrix: ...@@ -56,15 +60,17 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-5.0 - llvm-toolchain-trusty-5.0
packages: packages:
- clang-5.0 - clang-5.0
env: env:
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" - MATRIX_CC=clang-5.0
- MATRIX_CXX=clang++-5.0
# Mac. We only test Clang because Mac builds are expensive for Travis and probably any # Mac. We only test Clang because Mac builds are expensive for Travis and probably any
# compiler-specific problems will be caught on the Linux matrix anyway. # compiler-specific problems will be caught on the Linux matrix anyway.
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
env: env:
- MATRIX_EVAL="CC=clang && CXX=clang++" - MATRIX_CC=clang
- MATRIX_CXX=clang++
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment