From b0cef1c68042e5cc22977ab8eba80c5863d4478e Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sun, 15 Dec 2019 18:03:27 +0100 Subject: [PATCH] Reduce number of Linux jobs run on PRs The library is mostly for windows, so there isn't much to test on Linux Reduce to oldest and most recent compilers But still test all on pushes to eventually detect compiler version specific issues Fixes #50 --- .travis.yml | 83 +++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4158b46..f7cfb5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,16 +21,54 @@ jobs: - env: BOGUS_JOB=true include: - - compiler: g++ - env: CXXSTD=03,11 - - - compiler: g++-4.4 + - stage: essential + compiler: g++-4.4 env: CXXSTD=98,0x addons: apt: packages: [g++-4.4] sources: [ubuntu-toolchain-r-test] + - compiler: g++-9 + env: UBSAN=1 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold + addons: + apt: + packages: [g++-9] + sources: [ubuntu-toolchain-r-test] + + - dist: trusty + compiler: /usr/bin/clang++ + env: CXXSTD=03,11 + addons: + apt: + packages: [clang-3.3] + + - compiler: clang++-9 + env: UBSAN=1 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 VISIBILITY=global + addons: + apt: + packages: [clang-9] + sources: + - ubuntu-toolchain-r-test + - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + + - dist: trusty + compiler: clang++-libc++ + env: UBSAN=1 CXXSTD=03,11,14 UBSAN_OPTIONS=print_stacktrace=1 + addons: + apt: + packages: [libc++-dev] + + - os: osx + compiler: clang++ + env: UBSAN=1 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1 + + # Additional compiler versions tested for completenes + - stage: additional + compiler: g++ + env: CXXSTD=03,11 + - compiler: g++-4.6 env: CXXSTD=03,0x addons: @@ -94,23 +132,9 @@ jobs: packages: [g++-9] sources: [ubuntu-toolchain-r-test] - - compiler: g++-9 - env: UBSAN=1 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold - addons: - apt: - packages: [g++-9] - sources: [ubuntu-toolchain-r-test] - - compiler: clang++ env: CXXSTD=03,11 - - dist: trusty - compiler: /usr/bin/clang++ - env: CXXSTD=03,11 - addons: - apt: - packages: [clang-3.3] - - dist: trusty compiler: /usr/bin/clang++ env: CXXSTD=03,11 @@ -202,35 +226,20 @@ jobs: - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - - compiler: clang++-8 - env: UBSAN=1 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 VISIBILITY=global - addons: - apt: - packages: [clang-8] - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-8 - - compiler: clang++-libc++ env: CXXSTD=03,11,14 addons: apt: packages: [libc++-dev] - - dist: trusty - compiler: clang++-libc++ - env: UBSAN=1 CXXSTD=03,11,14 UBSAN_OPTIONS=print_stacktrace=1 - addons: - apt: - packages: [libc++-dev] - - os: osx compiler: clang++ env: CXXSTD=03,11,14,1z - - os: osx - compiler: clang++ - env: UBSAN=1 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1 +stages: + - essential + - name: additional + if: type != "pull_request" install: - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true