1
0
forked from boostorg/mp11

Merge branch 'feature/travis-clang-7' into develop

This commit is contained in:
Peter Dimov
2018-12-17 00:37:33 +02:00

View File

@@ -6,8 +6,6 @@ language: cpp
sudo: false sudo: false
python: "2.7"
branches: branches:
only: only:
- master - master
@@ -86,7 +84,7 @@ matrix:
- os: linux - os: linux
compiler: g++-8 compiler: g++-8
env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=11,14,17 env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=11,14,17,2a
addons: addons:
apt: apt:
packages: packages:
@@ -192,6 +190,17 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0 - llvm-toolchain-trusty-6.0
- os: linux
compiler: clang++-7
env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=11,14,17,2a
addons:
apt:
packages:
- clang-7
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
- os: linux - os: linux
compiler: clang++-libc++ compiler: clang++-libc++
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z