From 2e23da9630267fca5ad6b75708cd91a3bd15140c Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 6 Feb 2017 19:01:42 +0200 Subject: [PATCH 1/5] Add platform matrix to .travis.yml --- .travis.yml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d32efa..a5dd317 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,112 @@ branches: - master - develop +env: + matrix: + - BOGUS_JOB=true + +addons: + apt: + packages: + - g++-4.7 + - g++-4.8 + - g++-4.9 + - g++-5 + - g++-6 + - clang-3.6 + - clang-3.7 + - clang-3.8 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise + - llvm-toolchain-precise-3.6 + - llvm-toolchain-precise-3.7 + - llvm-toolchain-precise-3.8 + +matrix: + + exclude: + - env: BOGUS_JOB=true + + include: + - os: linux + env: TOOLSET=gcc COMPILER=g++ CXXSTD=c++03 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++03 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++03 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++03 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++03 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z + + - os: linux + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++03 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++03 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++03 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14 + + - os: linux + env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z + + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 + + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 + + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 + install: - cd .. - git clone -b $TRAVIS_BRANCH https://github.com/boostorg/boost.git boost-root @@ -42,8 +148,8 @@ install: - ./b2 headers script: - - TOOLSET=gcc,clang - - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi + - |- + echo "using $TOOLSET : : $COMPILER : -std=$CXXSTD ;" > ~/user-config.jam - ./b2 libs/bind/test toolset=$TOOLSET notifications: From 2a29af7e4fb57bb42b24ae4ba40bbff8af40d0ba Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 6 Feb 2017 21:57:46 +0200 Subject: [PATCH 2/5] Only install necessary packages in .travis.yml to speed it up --- .travis.yml | 96 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5dd317..4eb04d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,15 +21,6 @@ env: addons: apt: - packages: - - g++-4.7 - - g++-4.8 - - g++-4.9 - - g++-5 - - g++-6 - - clang-3.6 - - clang-3.7 - - clang-3.8 sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise @@ -48,69 +39,156 @@ matrix: - os: linux env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++03 + addons: + apt: + packages: + - g++-4.7 - os: linux env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 + addons: + apt: + packages: + - g++-4.7 - os: linux env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++03 + addons: + apt: + packages: + - g++-4.8 - os: linux env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11 + addons: + apt: + packages: + - g++-4.8 - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++03 + addons: + apt: + packages: + - g++-4.9 - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 + addons: + apt: + packages: + - g++-4.9 - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++03 + addons: + apt: + packages: + - g++-5 - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11 + addons: + apt: + packages: + - g++-5 - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 + addons: + apt: + packages: + - g++-5 - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 + addons: + apt: + packages: + - g++-6 - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 + addons: + apt: + packages: + - g++-6 - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 + addons: + apt: + packages: + - g++-6 - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z + addons: + apt: + packages: + - g++-6 - os: linux env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 + - os: linux + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 + - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++03 + addons: + apt: + packages: + - clang-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 + addons: + apt: + packages: + - clang-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++03 + addons: + apt: + packages: + - clang-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11 + addons: + apt: + packages: + - clang-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++03 + addons: + apt: + packages: + - clang-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11 + addons: + apt: + packages: + - clang-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14 + addons: + apt: + packages: + - clang-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z + addons: + apt: + packages: + - clang-3.8 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 From b51caf19343329021606d8011a77510cf11e07e3 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 6 Feb 2017 22:17:50 +0200 Subject: [PATCH 3/5] Move apt sources into the matrix --- .travis.yml | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4eb04d6..21603b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,15 +19,6 @@ env: matrix: - BOGUS_JOB=true -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise - - llvm-toolchain-precise-3.6 - - llvm-toolchain-precise-3.7 - - llvm-toolchain-precise-3.8 - matrix: exclude: @@ -43,6 +34,8 @@ matrix: apt: packages: - g++-4.7 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 @@ -50,6 +43,8 @@ matrix: apt: packages: - g++-4.7 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++03 @@ -57,6 +52,8 @@ matrix: apt: packages: - g++-4.8 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11 @@ -64,6 +61,8 @@ matrix: apt: packages: - g++-4.8 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++03 @@ -71,6 +70,8 @@ matrix: apt: packages: - g++-4.9 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 @@ -78,6 +79,8 @@ matrix: apt: packages: - g++-4.9 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++03 @@ -85,6 +88,8 @@ matrix: apt: packages: - g++-5 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11 @@ -92,6 +97,8 @@ matrix: apt: packages: - g++-5 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 @@ -99,6 +106,8 @@ matrix: apt: packages: - g++-5 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 @@ -106,6 +115,8 @@ matrix: apt: packages: - g++-6 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 @@ -113,6 +124,8 @@ matrix: apt: packages: - g++-6 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 @@ -120,6 +133,8 @@ matrix: apt: packages: - g++-6 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z @@ -127,6 +142,8 @@ matrix: apt: packages: - g++-6 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 @@ -140,6 +157,8 @@ matrix: apt: packages: - clang-3.6 + sources: + - llvm-toolchain-precise-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 @@ -147,6 +166,8 @@ matrix: apt: packages: - clang-3.6 + sources: + - llvm-toolchain-precise-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++03 @@ -154,6 +175,8 @@ matrix: apt: packages: - clang-3.7 + sources: + - llvm-toolchain-precise-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11 @@ -161,6 +184,8 @@ matrix: apt: packages: - clang-3.7 + sources: + - llvm-toolchain-precise-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++03 @@ -168,6 +193,8 @@ matrix: apt: packages: - clang-3.8 + sources: + - llvm-toolchain-precise-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11 @@ -175,6 +202,8 @@ matrix: apt: packages: - clang-3.8 + sources: + - llvm-toolchain-precise-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14 @@ -182,6 +211,8 @@ matrix: apt: packages: - clang-3.8 + sources: + - llvm-toolchain-precise-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z @@ -189,6 +220,8 @@ matrix: apt: packages: - clang-3.8 + sources: + - llvm-toolchain-precise-3.8 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 From ecc0e72841de0722e2729c06288eb73cb4a89178 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 7 Feb 2017 01:03:59 +0200 Subject: [PATCH 4/5] Add llvm-toolchain-precise to clang apt sources --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 21603b7..7cd4b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,6 +158,7 @@ matrix: packages: - clang-3.6 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.6 - os: linux @@ -167,6 +168,7 @@ matrix: packages: - clang-3.6 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.6 - os: linux @@ -176,6 +178,7 @@ matrix: packages: - clang-3.7 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.7 - os: linux @@ -185,6 +188,7 @@ matrix: packages: - clang-3.7 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.7 - os: linux @@ -194,6 +198,7 @@ matrix: packages: - clang-3.8 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.8 - os: linux @@ -203,6 +208,7 @@ matrix: packages: - clang-3.8 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.8 - os: linux @@ -212,6 +218,7 @@ matrix: packages: - clang-3.8 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.8 - os: linux @@ -221,6 +228,7 @@ matrix: packages: - clang-3.8 sources: + - llvm-toolchain-precise - llvm-toolchain-precise-3.8 - os: osx From ce4df8a6666b2097af6021af1ff4eb1f83d8faca Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 7 Feb 2017 01:29:04 +0200 Subject: [PATCH 5/5] Add ubuntu-toolchain-r-test to clang apt sources --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7cd4b60..9f21bdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,7 +158,7 @@ matrix: packages: - clang-3.6 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.6 - os: linux @@ -168,7 +168,7 @@ matrix: packages: - clang-3.6 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.6 - os: linux @@ -178,7 +178,7 @@ matrix: packages: - clang-3.7 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.7 - os: linux @@ -188,7 +188,7 @@ matrix: packages: - clang-3.7 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.7 - os: linux @@ -198,7 +198,7 @@ matrix: packages: - clang-3.8 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.8 - os: linux @@ -208,7 +208,7 @@ matrix: packages: - clang-3.8 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.8 - os: linux @@ -218,7 +218,7 @@ matrix: packages: - clang-3.8 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.8 - os: linux @@ -228,7 +228,7 @@ matrix: packages: - clang-3.8 sources: - - llvm-toolchain-precise + - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.8 - os: osx