Use a specific lint docker image

CircleCI-Public · Jul 5, 2018 · 5990828 · 5990828
1 parent 43130ad
commit 5990828
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 31 deletions.
diff --git a/.circleci/build.yml b/.circleci/build.yml
@@ -45,21 +45,14 @@ jobs:
       - codecov/upload:
           path: coverage.txt
   lint:
-    executor: go
+    docker:
+      - image: supinf/gometalinter:latest
+        environment:
+          CGO_ENABLED: 0
+    working_directory: /go/src/github.com/CircleCI-Public/circleci-cli
     steps:
-      - checkout
-      - restore_cache:
-          keys: [v1-gometalinter-]
-      - run:
-          name: Install
-          command: |
-            [[ -e /go/bin/gometalinter ]] && exit
-            go get -u github.com/alecthomas/gometalinter
-            gometalinter --install
-      - run: make lint
-      - save_cache:
-          key: v1-gometalinter-{{ checksum "/go/bin/gometalinter" }}
-          paths: [/go/bin/*]
+    - checkout
+    - run: gometalinter --deadline 60s --vendor ./...
 
   deploy:
     executor: go

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,25 +34,14 @@ jobs:
           &pr=$CIRCLE_PR_NUMBER"
   lint:
     docker:
-    - image: circleci/golang:1.10
+    - image: supinf/gometalinter:latest
+      environment:
+        CGO_ENABLED: 0
     working_directory: /go/src/github.com/CircleCI-Public/circleci-cli
     steps:
     - checkout
-    - restore_cache:
-        keys:
-        - v1-gometalinter-
     - run:
-        name: Install
-        command: |
-          [[ -e /go/bin/gometalinter ]] && exit
-          go get -u github.com/alecthomas/gometalinter
-          gometalinter --install
-    - run:
-        command: make lint
-    - save_cache:
-        key: v1-gometalinter-{{ checksum "/go/bin/gometalinter" }}
-        paths:
-        - /go/bin/*
+        command: gometalinter --deadline 60s --vendor ./...
   deploy:
     docker:
     - image: circleci/golang:1.10

diff --git a/api/api.go b/api/api.go
@@ -54,9 +54,9 @@ func buildAndOrbQuery(ctx context.Context, logger *logger.Logger, configPath str
 
 	request := client.NewAuthorizedRequest(viper.GetString("token"), query)
 	request.Var("config", config)
-	client := client.NewClient(viper.GetString("endpoint"), logger)
+	graphQLclient := client.NewClient(viper.GetString("endpoint"), logger)
 
-	err = client.Run(ctx, request, response)
+	err = graphQLclient.Run(ctx, request, response)
 
 	if err != nil {
 		return errors.Wrap(err, "Unable to validate config")