feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Update .travis.yml

Browse Source
This commit is contained in:
Peter Dimov
2017-12-03 23:30:13 +02:00
parent aecc402971
commit 3c00cb8760
1 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
.travis.yml
View File

@@ -6,16 +6,11 @@ language: cpp
sudo: false sudo: false
python: "2.7"
os:
- linux
- osx
branches: branches:
only: only:
- master - master
- develop - develop
- /feature\/.*/
env: env:
matrix: matrix:
@@ -58,7 +53,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14 env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -84,11 +79,20 @@ matrix:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
addons:
apt:
packages:
- g++-7
sources:
- ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -98,7 +102,7 @@ matrix:
- llvm-toolchain-precise-3.5 - llvm-toolchain-precise-3.5
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -108,7 +112,7 @@ matrix:
- llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.6
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -137,21 +141,43 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-precise-3.9
- os: linux
compiler: clang++-4.0
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-4.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0
- os: linux
compiler: clang++-5.0
env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-5.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode9.1
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode9
- os: osx - os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode8.3 osx_image: xcode8.3
- os: osx - os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode8.2 osx_image: xcode8
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode8.1
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode8.0
- os: osx - os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
@@ -162,8 +188,9 @@ matrix:
osx_image: xcode6.4 osx_image: xcode6.4
install: install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
- cd .. - cd ..
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init libs/detail - git submodule update --init libs/detail