Skip to content
This repository was archived by the owner on Sep 28, 2022. It is now read-only.

Commit fecb28e

Browse files
committed
Add CircleCI
1 parent 9ece1ce commit fecb28e

File tree

3 files changed

+77
-5
lines changed

3 files changed

+77
-5
lines changed

.circleci/config.yml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
version: 2
2+
defaults: &defaults
3+
working_directory: /go/src/github.com/pilosa/pdk
4+
docker:
5+
- image: circleci/golang:1.10
6+
fast-checkout: &fast-checkout
7+
attach_workspace:
8+
at: .
9+
jobs:
10+
build:
11+
<<: *defaults
12+
steps:
13+
- checkout
14+
- restore_cache:
15+
keys:
16+
- vendor-cache-{{ checksum "Gopkg.lock" }}
17+
- run: "[ -d vendor ] || make vendor"
18+
- save_cache:
19+
key: vendor-cache-{{ checksum "Gopkg.lock" }}
20+
paths:
21+
- vendor
22+
- persist_to_workspace:
23+
root: .
24+
paths: "*"
25+
linter:
26+
<<: *defaults
27+
steps:
28+
- *fast-checkout
29+
- run: go get -u github.com/alecthomas/gometalinter
30+
- run: gometalinter --install
31+
- run: go get github.com/remyoudompheng/go-misc/deadcode
32+
- run: make gometalinter
33+
test-golang-1.10: &base-test
34+
<<: *defaults
35+
steps:
36+
- *fast-checkout
37+
- run: make test
38+
test-golang-1.11-rc:
39+
<<: *base-test
40+
docker:
41+
- image: circleci/golang:1.11-rc
42+
workflows:
43+
version: 2
44+
test:
45+
jobs:
46+
- build
47+
- linter:
48+
requires:
49+
- build
50+
- test-golang-1.10:
51+
requires:
52+
- build
53+
- test-golang-1.11-rc:
54+
requires:
55+
- build

Makefile

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: dep pdk vendor-update docker pdk crossbuild install test
1+
.PHONY: dep pdk vendor-update docker pdk crossbuild install test test-all gometalinter
22

33
DEP := $(shell command -v dep 2>/dev/null)
44
PROTOC := $(shell command -v protoc 2>/dev/null)
@@ -21,7 +21,7 @@ vendor: Gopkg.toml
2121
ifndef DEP
2222
make dep
2323
endif
24-
dep ensure
24+
dep ensure -vendor-only
2525
touch vendor
2626

2727
Gopkg.lock: dep Gopkg.toml
@@ -42,3 +42,20 @@ crossbuild: vendor
4242

4343
install: vendor
4444
go install $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pdk
45+
46+
gometalinter: vendor
47+
gometalinter --vendor --disable-all \
48+
--deadline=120s \
49+
--enable=deadcode \
50+
--enable=goimports \
51+
--enable=gotype \
52+
--enable=gotypex \
53+
--enable=ineffassign \
54+
--enable=interfacer \
55+
--enable=maligned \
56+
--enable=nakedret \
57+
--enable=unconvert \
58+
--enable=vet \
59+
--exclude "^internal/.*\.pb\.go" \
60+
--exclude "^pql/pql.peg.go" \
61+
./...

statlogiface.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ type StdLogger struct {
8686

8787
// Printf implements Logger interface.
8888
func (s StdLogger) Printf(format string, v ...interface{}) {
89-
s.Logger.Printf(format, v)
89+
s.Logger.Printf(format, v...)
9090
}
9191

9292
// Debugf implements Logger interface, but prints nothing.
@@ -99,10 +99,10 @@ type VerboseLogger struct {
9999

100100
// Printf implements Logger interface.
101101
func (s VerboseLogger) Printf(format string, v ...interface{}) {
102-
s.Logger.Printf(format, v)
102+
s.Logger.Printf(format, v...)
103103
}
104104

105105
// Debugf implements Logger interface.
106106
func (s VerboseLogger) Debugf(format string, v ...interface{}) {
107-
s.Logger.Printf(format, v)
107+
s.Logger.Printf(format, v...)
108108
}

0 commit comments

Comments
 (0)