From 62aa1b9717eb3a9b083bbbab744ad3e9f9f181b3 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 19 Feb 2019 16:38:22 -0800 Subject: [PATCH] Reorder Travis matrix items --- .travis.yml | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5556be5b..4741abeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,16 +25,6 @@ addons: matrix: include: - # Default g++ - - os: linux - compiler: g++ - script: b2 -j3 libs/beast/test toolset=gcc cxxstd=11 - - # Default clang++ - - os: linux - compiler: clang++ - script: b2 -j3 libs/beast/test toolset=clang cxxstd=11 - # GCC 6.0, Debug + Coverage - os: linux compiler: g++-6 @@ -55,6 +45,45 @@ matrix: sources: - *base_sources + # Default clang++ + - os: linux + compiler: clang++ + script: b2 -j3 libs/beast/test toolset=clang cxxstd=11 + + # OSX Clang, C++11, libc++, debug, + # - if: branch != master + - os: osx + compiler: clang++ + env: + - VARIANT=debug + - TOOLSET=clang + - COMPILER=clang++ + - CXXSTD=14 + before_install: + - brew install openssl + - export OPENSSL_ROOT=$(brew --prefix openssl) + + # Default g++ + - os: linux + compiler: g++ + script: b2 -j3 libs/beast/test toolset=gcc cxxstd=11 + + # GCC 8, C++14, libstdc++, release + - os: linux + compiler: g++-8 + env: + - VARIANT=release + - TOOLSET=gcc + - COMPILER=g++-8 + - CXXSTD=14 + addons: + apt: + packages: + - g++-8 + - *base_packages + sources: + - *base_sources + # GCC 5.0, Valgrind - os: linux compiler: g++-5 @@ -93,35 +122,6 @@ matrix: - llvm-toolchain-precise-3.8 - *base_sources - # GCC 8, C++14, libstdc++, release - - os: linux - compiler: g++-8 - env: - - VARIANT=release - - TOOLSET=gcc - - COMPILER=g++-8 - - CXXSTD=14 - addons: - apt: - packages: - - g++-8 - - *base_packages - sources: - - *base_sources - - # OSX Clang, C++11, libc++, debug, - # - if: branch != master - - os: osx - compiler: clang++ - env: - - VARIANT=debug - - TOOLSET=clang - - COMPILER=clang++ - - CXXSTD=14 - before_install: - - brew install openssl - - export OPENSSL_ROOT=$(brew --prefix openssl) - install: - export BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - cd ..