Skip to content

Commit 0a6f0dc

Browse files
committed
Update Travis config to support more compilers
This change allows us to get more compilers and eventually more platforms being tested.
1 parent 8cafe88 commit 0a6f0dc

File tree

1 file changed

+73
-12
lines changed

1 file changed

+73
-12
lines changed

.travis.yml

Lines changed: 73 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
sudo: false
2+
dist: trusty
23
language: cpp
4+
os:
5+
- linux
36
compiler:
47
- g++
58
- clang
@@ -21,6 +24,73 @@ cache:
2124
- apt
2225
- ccache
2326
matrix:
27+
include:
28+
# GCC configurations
29+
- os: linux
30+
addons:
31+
apt:
32+
sources:
33+
- ubuntu-toolchain-r-test
34+
packages:
35+
- g++-4.9
36+
env:
37+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
38+
- os: linux
39+
addons:
40+
apt:
41+
sources:
42+
- ubuntu-toolchain-r-test
43+
packages:
44+
- g++-5
45+
env:
46+
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
47+
- os: linux
48+
addons:
49+
apt:
50+
sources:
51+
- ubuntu-toolchain-r-test
52+
packages:
53+
- g++-6
54+
env:
55+
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
56+
# Clang configurations
57+
- os: linux
58+
addons:
59+
apt:
60+
sources:
61+
- ubuntu-toolchain-r-test
62+
- llvm-toolchain-precise-3.8
63+
packages:
64+
- clang-3.8
65+
env:
66+
- MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
67+
- os: linux
68+
addons:
69+
apt:
70+
sources:
71+
- llvm-toolchain-trusty-3.9
72+
packages:
73+
- clang-3.9
74+
env:
75+
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
76+
- os: linux
77+
addons:
78+
apt:
79+
sources:
80+
- llvm-toolchain-trusty-4.0
81+
packages:
82+
- clang-4.0
83+
env:
84+
- MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
85+
- os: linux
86+
addons:
87+
apt:
88+
sources:
89+
- llvm-toolchain-trusty-5.0
90+
packages:
91+
- clang-5.0
92+
env:
93+
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
2494
exclude:
2595
- compiler: g++
2696
env: BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread" Uri_BUILD_TEST=OFF Uri_DISABLE_LIBCXX=YES
@@ -29,19 +99,12 @@ matrix:
2999
# TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
30100
# - compiler: g++
31101
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
102+
before_install:
103+
- eval "${MATRIX_EVAL}"
32104
install:
33105
- pwd
34106
- export CUR_DIR=`pwd`
35107
- mkdir -p ${CUR_DIR}/bin
36-
- if [ "${CC}" = "gcc" ]; then
37-
export CXX=g++-4.9;
38-
export CC=gcc-4.9;
39-
fi
40-
- if [ "${CC}" = "clang" ]; then
41-
export CXX=clang++-3.8;
42-
export CC=clang-3.8;
43-
export CCACHE_CPP2=yes;
44-
fi
45108
before_script:
46109
- echo ${CXX}
47110
- "${CXX} --version"
@@ -55,13 +118,11 @@ after_failure:
55118
addons:
56119
apt:
57120
sources:
58-
- ubuntu-toolchain-r-test
59-
- llvm-toolchain-precise-3.8
60121
- kalakris-cmake
61122
- boost-latest
62123
- george-edison55-precise-backports
63124
packages:
64-
- libboost1.55-all-dev
125+
- libboost-all-dev
65126
- gcc-4.9
66127
- g++-4.9
67128
- clang-3.8

0 commit comments

Comments
 (0)