diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-05-16 07:58:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 07:58:05 +0200 |
| commit | 7497a3a2d76e2dc354a0a428bb037a4152b9afc4 (patch) | |
| tree | 5dbe164031dcf7e86467c43cbaf59f78cec77522 | |
| parent | b7b1a808bea0080c07902453be1fc1f827f48f6c (diff) | |
| parent | d067c887251d275df20ee4bbd0917ff033f203cd (diff) | |
| download | ATCD-7497a3a2d76e2dc354a0a428bb037a4152b9afc4.tar.gz | |
Merge pull request #627 from jwillemsen/jwi-gcc8-travis
Add clang6 and gcc8 on travis-ci
| -rw-r--r-- | .travis.yml | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f840f89d7d9..5255b611543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO - MPC_ROOT=$TRAVIS_BUILD_DIR/MPC - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH - - COMPILER=g++-7 + - COMPILER=g++-8 matrix: include: @@ -31,12 +31,43 @@ matrix: apt: sources: - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-6.0 + packages: + - libxerces-c-dev + - libssl-dev + - clang-6.0 + env: COMPILER='clang++-6.0' VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test - llvm-toolchain-trusty-5.0 packages: - libxerces-c-dev - libssl-dev - - clang++-5.0 - env: COMPILER=clang++-5.0 VERSIONED=1 TAO=1 ACETESTS=1 + - clang-5.0 + env: COMPILER='clang++-5.0' VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libxerces-c-dev + - libssl-dev + - g++-7 + env: COMPILER='g++-7' VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libxerces-c-dev + - libssl-dev + - g++-6 + env: COMPILER='g++-6' VERSIONED=1 TAO=1 ACETESTS=1 - os: osx env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 @@ -47,7 +78,7 @@ addons: packages: - libssl-dev - libxerces-c-dev - - g++-7 + - g++-8 before_install: - git clone --depth 1 git://github.com/DOCGroup/MPC.git |