From 859d81a7ce44495573e1203ef2ffe7c30e918570 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 13 Jul 2017 14:47:26 +1200
Subject: [PATCH] [CI] Rework travis config

Use a matrix for clearer Linux/OS X separation

Use a trusty container for Linux build
---
 .travis.yml | 71 +++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 25 deletions(-)
 rewrite .travis.yml (96%)

diff --git a/.travis.yml b/.travis.yml
dissimilarity index 96%
index 1adf84b3..f057c1ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,46 @@
-language: cpp
-compiler:
-  - gcc
-os:
-  - linux
-  - osx
-before_install:
-  - test "$TRAVIS_OS_NAME" != linux || sudo apt-get -qq update
-  - test "$TRAVIS_OS_NAME" != linux || sudo apt-get -qq install libwxgtk3.0-dev libavcodec-dev libavformat-dev libproj-dev libswscale-dev mesa-common-dev libglu1-mesa-dev libx11-dev libxext-dev x11proto-core-dev liblocale-po-perl unifont sgmltools-lite jadetex docbook-utils w3m
-  - test "$TRAVIS_OS_NAME" != osx || brew update
-  - test "$TRAVIS_OS_NAME" != osx || brew install netpbm
-  - test "$TRAVIS_OS_NAME" != osx || brew install gnu-tar
-  - test "$TRAVIS_OS_NAME" != osx || sudo cpan -T -i local::lib < /dev/null
-  - test "$TRAVIS_OS_NAME" != osx || sudo cpan -I -T -i Locale::PO < /dev/null
-  - if test "$TRAVIS_OS_NAME" = osx ; then echo '[ $SHLVL -eq 1 ] && eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"' >> ~/.bashrc ; fi
-script:
-  - autoreconf -fiv
-  - test "$TRAVIS_OS_NAME" = osx || ./configure
-  - test "$TRAVIS_OS_NAME" = osx || make
-  - test "$TRAVIS_OS_NAME" = osx || make check
-  - if test "$TRAVIS_OS_NAME" = osx ; then V=`sed -e 's/^AC_INIT[^,]*, *\[\([^]]*\)\].*/\1/p;d' configure.ac` ; curl https://survex.com/software/$V/survex-$V.tar.gz | gtar --strip-components=1 --skip-old-files -zxf - ; ls -lrt lib ; touch lib/unifont.pixelfont lib/preload_font.h; echo ; ls -lrt doc; touch doc/*.1 doc/manual.txt doc/manual.pdf doc/manual/stampfile ; fi
-  - test "$TRAVIS_OS_NAME" != osx || ./buildmacosx.sh
-branches:
-  only:
-    - master
+dist: trusty
+language: cpp
+matrix:
+  include:
+    - compiler: gcc
+      os: linux
+      sudo: false
+      addons:
+        apt:
+          packages:
+            - libwxgtk3.0-dev
+            - libavcodec-dev
+            - libavformat-dev
+            - libproj-dev
+            - libswscale-dev
+            - mesa-common-dev
+            - libglu1-mesa-dev
+            - libx11-dev
+            - libxext-dev
+            - x11proto-core-dev
+            - liblocale-po-perl
+            - unifont
+            - sgmltools-lite
+            - jadetex
+            - docbook-utils
+            - w3m
+      script:
+        - autoreconf -fiv
+        - ./configure
+        - make
+        - make check
+    - os: osx
+      before_install:
+        - brew update
+        - brew install netpbm
+        - brew install gnu-tar
+        - sudo cpan -T -i local::lib < /dev/null
+        - sudo cpan -I -T -i Locale::PO < /dev/null
+        - echo '[ $SHLVL -eq 1 ] && eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"' >> ~/.bashrc
+      script:
+        - autoreconf -fiv
+        - V=`sed -e 's/^AC_INIT[^,]*, *\[\([^]]*\)\].*/\1/p;d' configure.ac` ; curl https://survex.com/software/$V/survex-$V.tar.gz | gtar --strip-components=1 --skip-old-files -zxf - ; ls -lrt lib ; touch lib/unifont.pixelfont lib/preload_font.h; echo ; ls -lrt doc; touch doc/*.1 doc/manual.txt doc/manual.pdf doc/manual/stampfile
+        - ./buildmacosx.sh
+branches:
+  only:
+    - master
-- 
2.11.4.GIT