Skip to content

Commit b71e071

Browse files
committed
Remove vendor and linting tasks
Linting should be decoupled from any library or repository. It is a tool that not affected the build, but help on detect bugs or analyze code.
1 parent 7080193 commit b71e071

File tree

4 files changed

+5
-102
lines changed

4 files changed

+5
-102
lines changed

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
.lint.out
21
cover.html
32
cover.out
4-
go-bindata/cover.out
5-
go-bindata/go-bindata
3+
/cmd/go-bindata/cover.out
4+
/cmd/go-bindata/go-bindata
65
lib.cover.out
76
testdata/out/
8-
vendor

Makefile

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
##
66

77
.PHONY: all build
8-
.PHONY: lint lint-all
98
.PHONY: test coverbrowse test-cmd
109
.PHONY: clean distclean
1110

@@ -52,13 +51,6 @@ TEST_OUT := \
5251
VENDOR_DIR :=$(PWD)/vendor
5352
VENDOR_BIN :=$(VENDOR_DIR)/bin
5453

55-
LINTER_OUT :=.lint.out
56-
LINTER_CMD :=$(VENDOR_BIN)/gometalinter
57-
LINTER_OPTS =\
58-
--vendor --concurrency=1 --deadline=240s --enable-gc --sort=path \
59-
--skip=testdata \
60-
--disable=gotype
61-
LINTER =GOBIN=$(VENDOR_BIN) $(VENDOR_BIN)/gometalinter $(LINTER_OPTS)
6254

6355
##
6456
## MAIN TARGET
@@ -71,33 +63,11 @@ all: build test-cmd
7163
##
7264

7365
clean:
74-
rm -rf $(TEST_COVER_OUT) $(TEST_COVER_HTML) $(TESTDATA_OUT_DIR) \
75-
$(LINTER_OUT)
66+
rm -rf $(TEST_COVER_OUT) $(TEST_COVER_HTML) $(TESTDATA_OUT_DIR)
7667

7768
distclean: clean
7869
rm -rf $(TARGET_CMD) $(TARGET_LIB) $(VENDOR_DIR)
7970

80-
##
81-
## LINT
82-
##
83-
84-
$(VENDOR_DIR): vendor.deps
85-
@echo ">>> Installing vendor dependencies ..."
86-
@./scripts/deps.sh $<
87-
@touch $@
88-
89-
$(LINTER_CMD): $(VENDOR_DIR)
90-
91-
$(LINTER_OUT): $(LINTER_CMD) $(CMD_SRC) $(CMD_TEST) $(LIB_SRC) $(LIB_TEST)
92-
@echo ">>> Linting ..."
93-
-$(LINTER) ./... > $@
94-
95-
lint: $(LINTER_OUT)
96-
@cat $<
97-
98-
lint-all: LINTER_OPTS+=--enable-all --disable=gotype --disable=nakedret
99-
lint-all: $(LINTER_OUT)
100-
@cat $<
10171

10272
##
10373
## TEST
@@ -127,7 +97,7 @@ $(TEST_COVER_HTML): $(TEST_COVER_ALL)
12797
@echo ">>> Generate HTML coverage '$@' ..."
12898
@go tool cover -html=$< -o $@
12999

130-
test: lint $(TEST_COVER_HTML)
100+
test: $(TEST_COVER_HTML)
131101

132102
coverbrowse: test
133103
@xdg-open $(TEST_COVER_HTML)
@@ -160,7 +130,6 @@ $(TESTDATA_OUT_DIR)/opt/no-output/bindata.go: $(TESTDATA_IN_DIR)/*
160130
-ignore="split/" ../../../../$(TESTDATA_IN_DIR)/...
161131
cp ./assert_test.go $(OUT_DIR)
162132
cp $(TESTDATA_DIR)/_bindata_test.go $(OUT_DIR)/bindata_test.go
163-
$(LINTER) $(OUT_DIR)
164133
go test -v $(OUT_DIR)
165134

166135
$(TESTDATA_OUT_DIR)/compress/memcopy/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/compress/memcopy
@@ -172,7 +141,6 @@ $(TESTDATA_OUT_DIR)/compress/memcopy/bindata.go: $(TESTDATA_IN_DIR)/*
172141
-ignore="split/" $(TESTDATA_IN_DIR)/...
173142
cp ./assert_test.go $(OUT_DIR)
174143
cp $(TESTDATA_DIR)/_bindata_test.go $(OUT_DIR)/bindata_test.go
175-
$(LINTER) $(OUT_DIR)
176144
go test -v $(OUT_DIR)
177145

178146
$(TESTDATA_OUT_DIR)/default/single/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/default/single
@@ -184,7 +152,6 @@ $(TESTDATA_OUT_DIR)/default/single/bindata.go: $(TESTDATA_IN_DIR)/*
184152
-ignore="split/" $(TESTDATA_IN_DIR)/test.asset
185153
cp ./assert_test.go $(OUT_DIR)
186154
cp $(TESTDATA_DIR)/_out_default_single.go $(OUT_DIR)/bindata_test.go
187-
$(LINTER) $(OUT_DIR) || rm -f $(OUT_DIR)/*
188155
go test -v $(OUT_DIR) || rm -f $(OUT_DIR)/*
189156

190157
$(TESTDATA_OUT_DIR)/compress/nomemcopy/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/compress/nomemcopy
@@ -196,7 +163,6 @@ $(TESTDATA_OUT_DIR)/compress/nomemcopy/bindata.go: $(TESTDATA_IN_DIR)/*
196163
-ignore="split/" -nomemcopy $(TESTDATA_IN_DIR)/...
197164
cp ./assert_test.go $(OUT_DIR)
198165
cp $(TESTDATA_DIR)/_bindata_test.go $(OUT_DIR)/bindata_test.go
199-
$(LINTER) $(OUT_DIR)
200166
go test -v $(OUT_DIR)
201167

202168
$(TESTDATA_OUT_DIR)/debug/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/debug
@@ -208,7 +174,6 @@ $(TESTDATA_OUT_DIR)/debug/bindata.go: $(TESTDATA_IN_DIR)/*
208174
-ignore="split/" -debug $(TESTDATA_IN_DIR)/...
209175
cp ./assert_test.go $(OUT_DIR)
210176
cp $(TESTDATA_DIR)/_bindata_test.go $(OUT_DIR)/bindata_test.go
211-
$(LINTER) $(OUT_DIR)
212177
go test -v $(OUT_DIR)
213178

214179
$(TESTDATA_OUT_DIR)/nocompress/memcopy/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/nocompress/memcopy
@@ -220,7 +185,6 @@ $(TESTDATA_OUT_DIR)/nocompress/memcopy/bindata.go: $(TESTDATA_IN_DIR)/*
220185
-ignore="split/" -nocompress $(TESTDATA_IN_DIR)/...
221186
cp ./assert_test.go $(OUT_DIR)
222187
cp $(TESTDATA_DIR)/_bindata_test.go $(OUT_DIR)/bindata_test.go
223-
$(LINTER) $(OUT_DIR)
224188
go test -v $(OUT_DIR)
225189

226190
$(TESTDATA_OUT_DIR)/nocompress/nomemcopy/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/nocompress/nomemcopy
@@ -232,7 +196,6 @@ $(TESTDATA_OUT_DIR)/nocompress/nomemcopy/bindata.go: $(TESTDATA_IN_DIR)/*
232196
-ignore="split/" -nocompress -nomemcopy $(TESTDATA_IN_DIR)/...
233197
cp ./assert_test.go $(OUT_DIR)
234198
cp $(TESTDATA_DIR)/_bindata_test.go $(OUT_DIR)/bindata_test.go
235-
$(LINTER) $(OUT_DIR)
236199
go test -v $(OUT_DIR)
237200

238201
$(TESTDATA_OUT_DIR)/split/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/split
@@ -245,7 +208,6 @@ $(TESTDATA_OUT_DIR)/split/bindata.go: $(TESTDATA_DIR)/_split_test.go $(TESTDATA_
245208
-split $(TESTDATA_IN_DIR)/split/...
246209
cp ./assert_test.go $(OUT_DIR)
247210
cp $< $(OUT_DIR)/bindata_test.go
248-
$(LINTER) $(OUT_DIR)
249211
go test -v $(OUT_DIR)
250212

251213
$(TESTDATA_OUT_DIR)/symlinkFile/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/symlinkFile
@@ -258,7 +220,6 @@ $(TESTDATA_OUT_DIR)/symlinkFile/bindata.go: $(TESTDATA_DIR)/symlinkFile $(TESTDA
258220
$(TESTDATA_DIR)/symlinkFile/...
259221
cp ./assert_test.go $(OUT_DIR)
260222
cp $(TESTDATA_DIR)/_symlinkFile_test.go $(OUT_DIR)/bindata_test.go
261-
$(LINTER) $(OUT_DIR)
262223
go test -v $(OUT_DIR)
263224

264225
$(TESTDATA_OUT_DIR)/symlinkParent/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/symlinkParent
@@ -271,7 +232,6 @@ $(TESTDATA_OUT_DIR)/symlinkParent/bindata.go: $(TESTDATA_DIR)/_symlinkParent_tes
271232
$(TESTDATA_DIR)/symlinkParent/...
272233
cp ./assert_test.go $(OUT_DIR)
273234
cp $< $(OUT_DIR)/bindata_test.go
274-
$(LINTER) $(OUT_DIR)
275235
go test -v $(OUT_DIR)
276236

277237
$(TESTDATA_OUT_DIR)/symlinkRecursiveParent/bindata.go: OUT_DIR=$(TESTDATA_OUT_DIR)/symlinkRecursiveParent
@@ -284,9 +244,8 @@ $(TESTDATA_OUT_DIR)/symlinkRecursiveParent/bindata.go: $(TESTDATA_DIR)/_symlinkR
284244
$(TESTDATA_DIR)/symlinkRecursiveParent/...
285245
cp ./assert_test.go $(OUT_DIR)
286246
cp $< $(OUT_DIR)/bindata_test.go
287-
$(LINTER) $(OUT_DIR)
288247
go test -v $(OUT_DIR)
289248

290-
$(TEST_OUT): $(LINTER_CMD) $(TARGET_CMD) $(POST_TEST_FILES)
249+
$(TEST_OUT): $(TARGET_CMD) $(POST_TEST_FILES)
291250

292251
test-cmd: $(TEST_OUT)

scripts/deps.sh

Lines changed: 0 additions & 43 deletions
This file was deleted.

vendor.deps

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)