Browse Source

get_vendor_deps does not require all the tools

- remove revision cmd
- rename ensure_tools to tools
pull/923/head
Anton Kaliaev 7 years ago
parent
commit
76cccfaabd
No known key found for this signature in database GPG Key ID: 7B6881D965918214
2 changed files with 13 additions and 13 deletions
  1. +12
    -13
      Makefile
  2. +1
    -0
      test/docker/Dockerfile

+ 12
- 13
Makefile View File

@ -60,25 +60,24 @@ get_deps:
grep -v /vendor/ | sort | uniq | \
xargs go get -v -d
get_vendor_deps: ensure_tools
update_deps:
@echo "--> Updating dependencies"
@go get -d -u ./...
get_vendor_deps:
@hash glide 2>/dev/null || go get github.com/Masterminds/glide
@rm -rf vendor/
@echo "--> Running glide install"
@glide install
update_deps: tools
@echo "--> Updating dependencies"
@go get -d -u ./...
revision:
-echo `git rev-parse --verify HEAD` > $(TMHOME)/revision
-echo `git rev-parse --verify HEAD` >> $(TMHOME)/revision_history
update_tools:
@echo "--> Updating tools"
@go get -u $(GOTOOLS)
tools:
go get -u -v $(GOTOOLS)
ensure_tools:
go get $(GOTOOLS)
test -f gometalinter & gometalinter --install
@echo "--> Installing tools"
@go get $(GOTOOLS)
@gometalinter --install
### Formatting, linting, and vetting


+ 1
- 0
test/docker/Dockerfile View File

@ -17,6 +17,7 @@ WORKDIR $REPO
ADD glide.yaml glide.yaml
ADD glide.lock glide.lock
ADD Makefile Makefile
RUN make tools
RUN make get_vendor_deps
# Install the apps


Loading…
Cancel
Save