From c201290179fd33b699c27e7ed181281c18a8fa06 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 22 Oct 2018 13:11:45 +0000
Subject: Expand the build matrix

---
 .travis.yml | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5c93c1..0f8af5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,26 @@
 dist: trusty
+sudo: false
 language: c
 matrix:
   include:
     - os: linux
+      compiler: clang
       env:
-        - MATRIX_EVAL="BUILD_DIR=unix"
+        - MATRIX_EVAL="" BUILD_DIR=unix
     - os: linux
+      compiler: clang
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared
+    - os: linux
+      compiler: gcc
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix
+    - os: linux
+      compiler: gcc
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared
+    - os: linux
+      compiler: gcc
       addons:
         apt:
           sources:
@@ -13,8 +28,9 @@ matrix:
           packages:
             - g++-4.9
       env:
-        - MATRIX_EVAL="CC=gcc-4.9 && BUILD_DIR=unix"
+        - MATRIX_EVAL="CC=gcc-4.9" BUILD_DIR=unix
     - os: linux
+      compiler: gcc
       addons:
         apt:
           sources:
@@ -22,8 +38,9 @@ matrix:
           packages:
             - g++-5
       env:
-        - MATRIX_EVAL="CC=gcc-5 && BUILD_DIR=unix"
+        - MATRIX_EVAL="CC=gcc-5" BUILD_DIR=unix
     - os: linux
+      compiler: gcc
       addons:
         apt:
           sources:
@@ -31,8 +48,9 @@ matrix:
           packages:
             - g++-6
       env:
-        - MATRIX_EVAL="CC=gcc-6 && BUILD_DIR=unix"
+        - MATRIX_EVAL="CC=gcc-6" BUILD_DIR=unix
     - os: linux
+      compiler: gcc
       addons:
         apt:
           sources:
@@ -40,26 +58,34 @@ matrix:
           packages:
             - g++-7
       env:
-        - MATRIX_EVAL="CC=gcc-7 && BUILD_DIR=unix"
+        - MATRIX_EVAL="CC=gcc-7" BUILD_DIR=unix
     - os: osx
       osx_image: xcode8
       env:
-        - MATRIX_EVAL="BUILD_DIR=unix"
+        - MATRIX_EVAL="" BUILD_DIR=unix
     - os: osx
       osx_image: xcode8
       env:
-        - MATRIX_EVAL="BUILD_DIR=macosx && NO_DIRECT_CONFIGURE=1"
+        - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+    - os: osx
+      osx_image: xcode9
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
+    - os: osx
+      osx_image: xcode10
+      env:
+        - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1
 ### C builds not currently supported on Windows instances
 #    - os: windows
 #      env:
-#        - MATRIX_EVAL="BUILD_DIR=win"
+#        - MATRIX_EVAL="" BUILD_DIR=win
 
 before_install:
   - eval "${MATRIX_EVAL}"
   - export ERROR_ON_FAILURES=1
   - cd ${BUILD_DIR}
 install:
-  - test -z "$NO_DIRECT_CONFIGURE" || ./configure
+  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
 script:
   - make
   - make test
-- 
cgit v0.12