Update .travis.yml (appneta#282)

fklassen · web-flow · commit 7f7eb95f1e22 · 2017-02-26T17:33:59.000-08:00
* Update .travis.yml

Another attempt at OS X build

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,31 +1,39 @@
 sudo: required
-dist: trusty
-
-os:
-  - linux
-  - osx
 
 language: c
 
-compiler:
-  - gcc
-  - clang
-
 addons:
   apt:
     packages:
     - libpcap-dev
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install homebrew/dupes/libpcap; fi
-
 cache:
   apt: true
 
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode6.4
+      compiler: gcc
+      before_install:
+        - brew update
+        - brew install autogen homebrew/dupes/libpcap
+    - os: osx
+      osx_image: xcode8.2
+      compiler: clang
+      before_install:
+        - brew update
+        - brew install autogen
+    - os: linux
+      dist: trusty
+      compiler: gcc
+    - os: linux
+      dist: trusty
+      compiler: clang
+ 
 script:
   - autoreconf -iv > build.log 2>&1 || (cat build.log && exit 1)
-  - ./configure > build.log 2>&1 || (cat build.log && exit 1)
+  - ./configure --disable-local-libopts > build.log 2>&1 || (cat build.log && exit 1)
   - make > build.log 2>&1 || (cat build.log && exit 1)
   - make dist > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make test
