docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Code Activity

Merge pull request #2164 from dmp42/12-make-helper

Browse Source 
Dependencies make helper
This commit is contained in:
Olivier Gambier
2015-11-04 09:23:09 -08:00
parent 34ee11e51d afb1411608
commit ab4b09bfb2
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTING.md
View File

@@ -145,6 +145,11 @@ Scrub build results:
make lint
make dco
### Save and restore dependencies
make dep-save
make dep-restore
## Integration Tests
### Setup

9
mk/dev.mk Normal file
View File

@@ -0,0 +1,9 @@
dep-save:
$(if $(GODEP), , \
$(error Please install godep: go get github.com/tools/godep))
godep save $(shell go list ./... | grep -v vendor/)
dep-restore:
$(if $(GODEP), , \
$(error Please install godep: go get github.com/tools/godep))
godep restore $(shell go list ./... | grep -v vendor/)

6
mk/main.mk
View File

@@ -3,7 +3,7 @@ GO_LDFLAGS := -X `go list ./version`.GitCommit=`git rev-parse --short HEAD 2>/de
GO_GCFLAGS :=
# Full package list
PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/Godeps/" | grep -v "/cmd")
PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/cmd")
# Support go1.5 vendoring (let us avoid messing with GOPATH or using godep)
export GO15VENDOREXPERIMENT = 1
@@ -12,6 +12,9 @@ export GO15VENDOREXPERIMENT = 1
GOLINT_BIN := $(GOPATH)/bin/golint
GOLINT := $(shell [ -x $(GOLINT_BIN) ] && echo $(GOLINT_BIN) || echo '')
GODEP_BIN := $(GOPATH)/bin/godep
GODEP := $(shell [ -x $(GODEP_BIN) ] && echo $(GODEP_BIN) || echo '')
# Honor debug
ifeq ($(DEBUG),true)
# Disable function inlining and variable registerization
@@ -36,6 +39,7 @@ endif
include mk/build.mk
include mk/coverage.mk
include mk/dev.mk
include mk/release.mk
include mk/test.mk
include mk/validate.mk

4
mk/validate.mk
View File

@@ -10,7 +10,7 @@ dco:
# Fmt
fmt:
@test -z "$$(gofmt -s -l . 2>&1 | grep -v vendor/ | grep -v Godeps/ | tee /dev/stderr)"
@test -z "$$(gofmt -s -l . 2>&1 | grep -v vendor/ | tee /dev/stderr)"
# Vet
vet: build
@@ -20,4 +20,4 @@ vet: build
lint:
$(if $(GOLINT), , \
$(error Please install golint: go get -u github.com/golang/lint/golint))
@test -z "$$($(GOLINT) ./... 2>&1 | grep -v vendor/ | grep -v Godeps/ | tee /dev/stderr)"
@test -z "$$($(GOLINT) ./... 2>&1 | grep -v vendor/ | tee /dev/stderr)"