From 01a0d76fd786b444980871f5f7372f8aa87213e3 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Thu, 16 Mar 2017 13:18:19 -0500
Subject: [PATCH] TravisCI: Remove a couple of linters.

The linters take quite a while to run in the TravisCI environment which
causes the deadline to be exceeded.

While here, also increase the allowed deadline for the remaining linters
to 10 minutes and also update Travis to use a new ubuntu distribution.
---
 .travis.yml |  1 +
 goclean.sh  | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f271e50a80..24786f9a7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: go
 go:
   - 1.7.x
diff --git a/goclean.sh b/goclean.sh
index 168aa8dd58..f3982cc117 100755
--- a/goclean.sh
+++ b/goclean.sh
@@ -2,10 +2,8 @@
 # The script does automatic checking on a Go package and its sub-packages, including:
 # 1. gofmt         (http://golang.org/cmd/gofmt/)
 # 2. go vet        (http://golang.org/cmd/vet)
-# 3. gosimple      (https://github.com/dominikh/go-simple)
-# 4. unconvert     (https://github.com/mdempsky/unconvert)
-# 5. race detector (http://blog.golang.org/race-detector)
-# 6. test coverage (http://blog.golang.org/cover)
+# 3. race detector (http://blog.golang.org/race-detector)
+# 4. test coverage (http://blog.golang.org/cover)
 
 # gometalinter (github.com/alecthomas/gometalinter) is used to run each each
 # static checker.
@@ -31,8 +29,6 @@ linter_targets=$(glide novendor)
 test -z "$(gometalinter --disable-all \
 --enable=gofmt \
 --enable=vet \
---enable=gosimple \
---enable=unconvert \
---deadline=4m $linter_targets 2>&1 | tee /dev/stderr)"
+--deadline=10m $linter_targets 2>&1 | tee /dev/stderr)"
 
 env GORACE="halt_on_error=1" go test -short -race $linter_targets