Merge branch 'master' of github.com:spf13/cobra into custom-help-verb

.circleci/config.yml

@@ -1,15 +1,11 @@
-workflows:
 version: 2
-  main:
+
-    jobs:
+references:
-      - go-current
+  workspace: &workspace
-      - go-previous
+    /go/src/github.com/spf13/cobra
-      - go-latest
+
-base: &base
+  run_tests: &run_tests
-  working_directory: /go/src/github.com/spf13/cobra
+    run:
-  steps:
-    - checkout
-    - run:
       name: "All Commands"
       command: |
         mkdir -p bin
@@ -18,21 +14,40 @@ base: &base
         go get -t -v ./...
         PATH=$PATH:$PWD/bin go test -v ./...
         go build
-          diff -u <(echo -n) <(gofmt -d -s .)
         if [ -z $NOVET ]; then
           diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
         fi
-version: 2
+
 jobs:
   go-current:
     docker:
-      - image: circleci/golang:1.10.0
+      - image: circleci/golang:1.11
-    <<: *base
+    working_directory: *workspace
+    steps:
+      - checkout
+      - *run_tests
+      - run:
+          name: "Check formatting"
+          command: diff -u <(echo -n) <(gofmt -d -s .)
   go-previous:
     docker:
-      - image: circleci/golang:1.9.4
+      - image: circleci/golang:1.10
-    <<: *base
+    working_directory: *workspace
+    steps:
+      - checkout
+      - *run_tests
   go-latest:
     docker:
       - image: circleci/golang:latest
-    <<: *base
+    working_directory: *workspace
+    steps:
+      - checkout
+      - *run_tests
+
+workflows:
+  version: 2
+  main:
+    jobs:
+      - go-current
+      - go-previous
+      - go-latest

.travis.yml

@@ -2,9 +2,11 @@ language: go
 
 matrix:
   include:
-    - go: 1.9.4
+    - go: 1.10.x
-    - go: 1.10.0
+    - go: 1.11.x
     - go: tip
+    - go: 1.11.x
+      script: diff -u <(echo -n) <(gofmt -d -s .)
   allow_failures:
     - go: tip
 
@@ -15,7 +17,6 @@ before_install:
 script:
   - PATH=$PATH:$PWD/bin go test -v ./...
   - go build
-  - diff -u <(echo -n) <(gofmt -d -s .)
   - if [ -z $NOVET ]; then
       diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
     fi