merge branch 'pr-1335'

Closes #1335 LGTMs: @crosbymichael @cyphar
2017-02-21 12:29:57 +11:00 · 2017-02-21 12:29:57 +11:00 · 3d7cd1f1b2
parent 8438b26e9f e773f96b0e
commit 3d7cd1f1b2
2 changed files with 7 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +1,12 @@
 language: go
 go:
-  - 1.6.x
  - 1.7.x
-# - master
+  - 1.8.x
+  - tip
+
+matrix:
+  allow_failures:
+    - go: tip

 # `make ci` uses Docker.
 sudo: required
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM golang:1.7.4
+FROM golang:1.8.0

 # libseccomp in jessie is not _quite_ new enough -- need backports version
 RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list