From 17fa7a7724998f9153afe1bb0e820c64d9f7a7f1 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 23 Sep 2019 10:42:14 -0700 Subject: [PATCH] travis matrix build switch to matrix build to test multiple ubuntu versions --- .travis.yml | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdbbd2d..b3f253f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ -sudo: false -dist: trusty language: c++ -compiler: - - gcc + addons: apt: packages: @@ -12,18 +9,35 @@ addons: - clang - g++-mingw-w64-i686 - qemu-system-x86 + +matrix: + include: + - dist: bionic + env: BRBASE=7.0 CMPLR=gcc + - dist: trusty + env: BRBASE=7.0 CMPLR=gcc + - dist: bionic + env: BRBASE=7.0 CMPLR=clang + - dist: trusty + env: BRBASE=7.0 CMPLR=clang + - dist: trusty + env: BRBASE=7.0 USR_CXXFLAGS=-std=c++11 + - dist: trusty + env: BRBASE=7.0 CMPLR=clang USR_CXXFLAGS=-std=c++11 + - dist: trusty + env: BRBASE=7.0 WINE=32 TEST=NO STATIC=YES + - dist: trusty + env: BRBASE=7.0 WINE=32 TEST=NO STATIC=NO + - dist: trusty + env: BRBASE=7.0 RTEMS=4.10 TEST=NO + - dist: trusty + env: BRBASE=7.0 RTEMS=4.9 TEST=NO + - dist: trusty + env: BRBASE=3.16 + - dist: trusty + env: BRBASE=3.15 + install: - ./.ci/travis-prepare.sh script: - ./.ci/travis-build.sh -env: - - BRBASE=7.0 CMPLR=gcc - - BRBASE=7.0 CMPLR=clang - - BRBASE=7.0 USR_CXXFLAGS=-std=c++11 - - BRBASE=7.0 CMPLR=clang USR_CXXFLAGS=-std=c++11 - - BRBASE=7.0 WINE=32 TEST=NO STATIC=YES - - BRBASE=7.0 WINE=32 TEST=NO STATIC=NO - - BRBASE=7.0 RTEMS=4.10 TEST=NO - - BRBASE=7.0 RTEMS=4.9 TEST=NO - - BRBASE=3.16 - - BRBASE=3.15