@@ -18,8 +18,7 @@ define build_resources
1818endef
1919
2020install : init # # install cli tools
21- export GO111MODULE=off ; \
22- go get -v github.com/rubenv/sql-migrate/... ;\
21+ go get -v github.com/rubenv/sql-migrate/... ; \
2322 go get -u github.com/google/wire/cmd/wire ;\
2423 go get -u github.com/vektah/dataloaden ;
2524
@@ -30,10 +29,8 @@ init: ## init packages
3029start : # # start daemon on development mode
3130 ./artifacts/bin daemon -c ./artifacts/configs/development.yaml -d
3231
33- vendor : # # generate vendor
34- rm -rf $(GO_DIR ) /vendor ; \
35- GO111MODULE=on \
36- go mod vendor
32+ dependencies : # # generate dependencies
33+ go mod download
3734
3835gqlgen-generate : # # generate graphql server
3936 go run github.com/99designs/gqlgen
@@ -43,17 +40,16 @@ prototool-generate: ## generate proto file
4340
4441build : init # # build binary file
4542 $(call build_resources) ; \
46- GO111MODULE=on GOOS=${GOOS} CGO_ENABLED=${CGO_ENABLED} GOARCH=${GOARCH} \
47- go build -mod vendor - ldflags " -X $( GO_PKG) /cmd/version.appVersion=$( TAG) -$$ (date -u +%Y%m%d%H%M)" -o " $( GO_DIR) /artifacts/bin" main.go
43+ GOOS=${GOOS} CGO_ENABLED=${CGO_ENABLED} GOARCH=${GOARCH} \
44+ go build -ldflags " -X $( GO_PKG) /cmd/version.appVersion=$( TAG) -$$ (date -u +%Y%m%d%H%M)" -o " $( GO_DIR) /artifacts/bin" main.go
4845
4946docker-image : # # build docker image
5047 REMOVE_CONTAINERS=${REMOVE_CONTAINERS} DOCKER_IMAGE=${DOCKER_IMAGE} ./scripts/remove_docker_containers.sh
5148 docker rmi ${DOCKER_IMAGE} :${TAG} -f || true ; \
5249 docker build --cache-from ${DOCKER_IMAGE} :${CACHE_TAG} -f " ${GO_DIR} /docker/app/Dockerfile" -t ${DOCKER_IMAGE} :${TAG} ${GO_DIR}
5350
5451test : # # test application with race
55- GO111MODULE=on \
56- go test -mod vendor -race -v ./...
52+ go test -v ./...
5753
5854coverage : # # test coverage
5955 go test -coverprofile=coverage.out ./...
@@ -65,7 +61,7 @@ createdb: ## create database
6561dropdb : # # drop database
6662 dropdb $(DATABASE_URL )
6763
68- .PHONY : install init vendor gqlgen-generate prototool-generate
64+ .PHONY : install init dependencies gqlgen-generate prototool-generate
6965
7066help :
7167 @grep -E ' ^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST ) | sort | awk ' BEGIN {FS = ":.*?## "}; {printf "033円[36m%-30s033円[0m %s\n", $1,ドル $2ドル}'
0 commit comments