diff --git a/.circleci/config.yml b/.circleci/config.yml index 77a27bdd06..b32db9b411 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: /go/src/github.com/grafana/metrictank docker: - - image: circleci/golang:1.10 + - image: circleci/golang:1.10.3 steps: - checkout - run: scripts/build.sh diff --git a/cluster/mock.go b/cluster/mock.go index a1b25aa17e..8b3a5820da 100644 --- a/cluster/mock.go +++ b/cluster/mock.go @@ -48,12 +48,11 @@ func NewMockNode(isLocal bool, name string, postResponse []byte) *MockNode { } type MockClusterManager struct { - Peers []*MockNode - membersForQuery []*MockNode - thisNode int - isPrimary bool - isReady bool - partitions []int32 + Peers []*MockNode + thisNode int + isPrimary bool + isReady bool + partitions []int32 } func (c *MockClusterManager) MemberList() []Node { diff --git a/scripts/qa/unused.sh b/scripts/qa/unused.sh index 7a14ef4507..3aa007d6aa 100755 --- a/scripts/qa/unused.sh +++ b/scripts/qa/unused.sh @@ -3,30 +3,28 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # and cd into root project dir cd ${DIR}/../.. -#which unused &>/dev/null || go get -u honnef.co/go/tools/... -#which varcheck &>/dev/null || go get github.com/opennota/check/cmd/varcheck -#which structcheck &>/dev/null || go get github.com/opennota/check/cmd/structcheck +which unused &>/dev/null || go get honnef.co/go/tools/cmd/unused +which varcheck &>/dev/null || go get github.com/opennota/check/cmd/varcheck +which structcheck &>/dev/null || go get github.com/opennota/check/cmd/structcheck # for https://github.com/remyoudompheng/go-misc/pull/14 which deadcode &>/dev/null || go get -u github.com/Dieterbe/go-misc/deadcode ret=0 -# temporarily commented becaused the repo of "unused" is broken. uncomment once it is fixed -#echo "## running unused" -#unused . -#r=$? -#[ $r -gt $ret ] && ret=$r +echo "## running unused" +unused . +r=$? +[ $r -gt $ret ] && ret=$r -# temporarily commented because a commit on the 31th of July also broke those two -#echo "## running varcheck" -#varcheck -#r=$? -#[ $r -gt $ret ] && ret=$r +echo "## running varcheck" +varcheck ./... +r=$? +[ $r -gt $ret ] && ret=$r -#echo "## running structcheck" -#structcheck -#r=$? -#[ $r -gt $ret ] && ret=$r +echo "## running structcheck" +structcheck ./... +r=$? +[ $r -gt $ret ] && ret=$r echo "## running deadcode" deadcode -test $(find . -type d | grep -v '.git' | grep -v vendor | grep -v docker)