Skip to content

Commit

Permalink
exclude developer tools from go modules. (#493)
Browse files Browse the repository at this point in the history
* Don't include golint in go module

* fix

* fix make travis
  • Loading branch information
pei0804 authored and ubogdan committed Aug 11, 2019
1 parent 16ebb32 commit 33a7940
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go:
- 1.12.x

install:
- make install
- make deps

script:
- make fmt-check
Expand Down
30 changes: 21 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ GOLINT:=$(shell which golint)
GOIMPORT:=$(shell which goimports)
GOFMT:=$(shell which gofmt)
GOBUILD:=$(GOCMD) build
GOINSTALL:=$(GOCMD) install
GOCLEAN:=$(GOCMD) clean
GOTEST:=$(GOCMD) test
GOGET:=$(GOCMD) get
GOLIST:=$(GOCMD) list
GOVET:=$(GOCMD) vet
u := $(if $(update),-u)

BINARY_NAME:=swag
PACKAGES:=$(shell $(GOLIST) github.com/swaggo/swag github.com/swaggo/swag/cmd/swag github.com/swaggo/swag/gen)
Expand All @@ -18,8 +20,12 @@ export GO111MODULE := on
all: test build

.PHONY: build
build:
$(GOBUILD) -o $(BINARY_NAME) -v ./cmd/...
build: deps
$(GOBUILD) -o $(BINARY_NAME) ./cmd/swag

.PHONY: install
install: deps
$(GOINSTALL) ./cmd/swag

.PHONY: test
test:
Expand All @@ -45,19 +51,25 @@ clean:
$(GOCLEAN)
rm -f $(BINARY_NAME)

.PHONY: install
install:
$(GOGET) -v github.com/swaggo/swag github.com/swaggo/swag/cmd/swag github.com/swaggo/swag/gen
$(GOGET) github.com/alecthomas/template
.PHONY: deps
deps:
$(GOGET) ${u} -d
$(GOGET) github.com/stretchr/testify/assert
$(GOGET) github.com/alecthomas/template

.PHONY: devel-deps
devel-deps:
GO111MODULE=off $(GOGET) -v ${u} \
golang.org/x/lint/golint \
github.com/swaggo/swag/cmd/swag \
github.com/swaggo/swag/gen

.PHONY: lint
lint:
which golint || $(GOGET) -u golang.org/x/lint/golint
lint: devel-deps
for PKG in $(PACKAGES); do golint -set_exit_status $$PKG || exit 1; done;

.PHONY: vet
vet:
vet: deps devel-deps
$(GOVET) $(PACKAGES)

.PHONY: fmt
Expand Down

0 comments on commit 33a7940

Please sign in to comment.