Просмотр исходного кода

Merge pull request #11648 from mjtrangoni/add-gometalinter-circleci

Add gometalinter to CircleCI
Carl Bergquist 7 лет назад
Родитель
Сommit
4f0d7586ae

+ 20 - 0
.circleci/config.yml

@@ -17,6 +17,22 @@ jobs:
           name: check documentation spelling errors
           command: 'codespell -I ./words_to_ignore.txt docs/'
 
+  gometalinter:
+    docker:
+      - image: circleci/golang:1.10
+    working_directory: /go/src/github.com/grafana/grafana
+    steps:
+      - checkout
+      - run:
+          name: install gometalinter tool
+          command: 'go get -u github.com/alecthomas/gometalinter'
+      - run:
+          name: install linters
+          command: 'gometalinter --install'
+      - run:
+          name: run some linters
+          command: 'gometalinter --vendor --deadline 6m --disable-all --enable=structcheck --enable=unconvert --enable=varcheck ./...'
+
   test-frontend:
     docker:
       - image: circleci/node:6.11.4
@@ -123,6 +139,10 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - gometalinter:
+          filters:
+            tags:
+              only: /.*/
       - build:
           filters:
             tags:

+ 2 - 2
pkg/services/alerting/engine.go

@@ -15,8 +15,8 @@ import (
 )
 
 type Engine struct {
-	execQueue     chan *Job
-	clock         clock.Clock
+	execQueue chan *Job
+	//clock         clock.Clock
 	ticker        *Ticker
 	scheduler     Scheduler
 	evalHandler   EvalHandler

+ 1 - 1
pkg/services/alerting/reader.go

@@ -16,7 +16,7 @@ type RuleReader interface {
 
 type DefaultRuleReader struct {
 	sync.RWMutex
-	serverID       string
+	//serverID       string
 	serverPosition int
 	clusterSize    int
 	log            log.Logger

+ 1 - 1
pkg/services/sqlstore/migrator/migrations.go

@@ -179,7 +179,7 @@ type CopyTableDataMigration struct {
 	targetTable string
 	sourceCols  []string
 	targetCols  []string
-	colMap      map[string]string
+	//colMap      map[string]string
 }
 
 func NewCopyTableDataMigration(targetTable string, sourceTable string, colMap map[string]string) *CopyTableDataMigration {