fix travis matrix build

Signed-off-by: Nathan Hjelm <hjelmn@me.com>

diff --git a/.travis.yml b/.travis.yml
index f8ef972..eb08224 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,33 @@
 language: c
 
-compiler:
-    - gcc
-    - clang
-
 matrix:
     include:
         - os: linux
-            # Require trusty for now as it has a more recent version of autoconf
-            dist: trusty
-            sudo: required
+          dist: trusty
+          sudo: required
+          compiler: gcc
+        - os: linux
+          dist: trusty
+          sudo: required
+          compiler: clang
+        - os: osx
+          osx_image: xcode8
+          compiler: gcc
+        - os: osx
+          osx_image: xcode8
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.1
+          compiler: gcc
         - os: osx
-            osx_image: xcode8
+          osx_image: xcode7.1
+          compiler: clang
         - os: osx
-            osx_image: xcode7.1
+          osx_image: beta-xcode6.2
+          compiler: gcc
         - os: osx
-            osx_image: beta-xcode6.2
+          osx_image: beta-xcode6.2
+          compiler: clang
 
 addons:
     apt:
@@ -29,7 +41,9 @@ addons:
             - ubuntu-toolchain-r-test
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew upgrade automake libtool; fi
+    # brew upgrade sets the return code to 1 if the latest version is already installed. the true command
+    # is used to reset the return code to 0.
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew upgrade automake libtool ; true; fi
 
 script:
     - ./autogen.sh && make -j4