From bbec970304026225a1f5fab1583b2c09d2bd9f0f Mon Sep 17 00:00:00 2001
From: Peter Edge <pedge@uber.com>
Date: Fri, 8 Mar 2019 12:35:27 -0500
Subject: [PATCH] fix(ci): use go vet, update to Go 1.12, update shellcheck to
 v0.4.6 (#832)

---
 .circleci/config.yml | 6 +++---
 .travis.yml          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d248bcda..819446439 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,13 +15,13 @@ references:
         PATH=$PATH:$PWD/bin go test -v ./...
         go build
         if [ -z $NOVET ]; then
-          diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
+          diff -u <(echo -n) <(go vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
         fi
 
 jobs:
   go-current:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: *workspace
     steps:
       - checkout
@@ -31,7 +31,7 @@ jobs:
           command: diff -u <(echo -n) <(gofmt -d -s .)
   go-previous:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.11
     working_directory: *workspace
     steps:
       - checkout
diff --git a/.travis.yml b/.travis.yml
index 5f157433a..a8d5ce4df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,21 +2,21 @@ language: go
 
 matrix:
   include:
-    - go: 1.10.x
     - go: 1.11.x
+    - go: 1.12.x
     - go: tip
-    - go: 1.11.x
+    - go: 1.12.x
       script: diff -u <(echo -n) <(gofmt -d -s .)
   allow_failures:
     - go: tip
 
 before_install:
   - mkdir -p bin
-  - curl -Lso bin/shellcheck https://github.com/caarlos0/shellcheck-docker/releases/download/v0.4.3/shellcheck
+  - curl -Lso bin/shellcheck https://github.com/caarlos0/shellcheck-docker/releases/download/v0.4.6/shellcheck
   - chmod +x bin/shellcheck
 script:
   - PATH=$PATH:$PWD/bin go test -v ./...
   - go build
   - if [ -z $NOVET ]; then
-      diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
+      diff -u <(echo -n) <(go vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
     fi