From 8164aa88ca94f405d0c73ddca4db3a57424bcf69 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Thu, 3 Aug 2017 15:07:56 -0400
Subject: [PATCH 1/2] Update travis config

to only test on 1.8.x, and ensure we route to Ubuntu Trusty and a
recent macOS image.
---
 .travis.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 890e185..1ee4604 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,18 @@
 language: go
-
 sudo: false
+dist: trusty
 
 cache:
   directories:
   - node_modules
 
-go:
-- 1.6.x
-- 1.7.x
-- 1.8.x
-- master
+go: 1.8.x
 
 matrix:
-  allow_failures:
-  - go: master
   include:
-  - go: 1.6.x
-    os: osx
-  - go: 1.7.x
-    os: osx
   - go: 1.8.x
     os: osx
+    osx_image: xcode8.3
 
 before_script:
 - go get github.com/urfave/gfmrun/... || true

From 184ffb5e573ba0656a123462715d360faaa0c897 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Thu, 3 Aug 2017 15:38:19 -0400
Subject: [PATCH 2/2] Use `os` matrix instead of explicit matrix.include

---
 .travis.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ee4604..cf8d098 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,17 @@
 language: go
 sudo: false
 dist: trusty
+osx_image: xcode8.3
+go: 1.8.x
+
+os:
+- linux
+- osx
 
 cache:
   directories:
   - node_modules
 
-go: 1.8.x
-
-matrix:
-  include:
-  - go: 1.8.x
-    os: osx
-    osx_image: xcode8.3
-
 before_script:
 - go get github.com/urfave/gfmrun/... || true
 - go get golang.org/x/tools/cmd/goimports