docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2544 from dgageot/simplify-makefile 

Simplify makefile
This commit is contained in:
David Gageot 2015-12-10 14:30:53 +01:00
parent 8a64fd4716 98b59afc39
commit 47354051e7
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -4,7 +4,7 @@ language: bash
services: docker services: docker
env: env:
matrix: matrix:
- TARGET_OS=linux TARGET_ARCH=amd64 TARGETS="make dco fmt lint vet test-long coverage-send" - TARGET_OS=linux TARGET_ARCH=amd64 TARGETS="make validate coverage-send"
- TARGET_OS=darwin TARGET_ARCH=amd64 TARGETS="cross" - TARGET_OS=darwin TARGET_ARCH=amd64 TARGETS="cross"
- TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="cross" - TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="cross"
script: USE_CONTAINER=true make "$TARGETS" script: USE_CONTAINER=true make "$TARGETS"

2
mk/main.mk
View File

@ -57,6 +57,6 @@ install:
clean: coverage-clean build-clean clean: coverage-clean build-clean
test: dco fmt test-short lint vet test: dco fmt test-short lint vet
validate: dco fmt vet lint test-short test-long validate: dco fmt lint vet test-long
.PHONY: .all_build .all_coverage .all_release .all_test .all_validate test build validate clean .PHONY: .all_build .all_coverage .all_release .all_test .all_validate test build validate clean

3
mk/test.mk
View File

@ -9,6 +9,3 @@ test-long:
test-integration: build test-integration: build
$(eval TESTSUITE=$(filter-out $@,$(MAKECMDGOALS))) $(eval TESTSUITE=$(filter-out $@,$(MAKECMDGOALS)))
test/integration/run-bats.sh $(TESTSUITE) test/integration/run-bats.sh $(TESTSUITE)
%:
@:

5
mk/validate.mk
View File

@ -8,15 +8,12 @@ current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
dco: dco:
@echo `bash $(current_dir)/../script/validate-dco` @echo `bash $(current_dir)/../script/validate-dco`
# Fmt
fmt: fmt:
@test -z "$$(gofmt -s -l . 2>&1 | grep -v vendor/ | tee /dev/stderr)" @test -z "$$(gofmt -s -l . 2>&1 | grep -v vendor/ | tee /dev/stderr)"
# Vet vet:
vet: build
@test -z "$$(go vet $(PKGS) 2>&1 | tee /dev/stderr)" @test -z "$$(go vet $(PKGS) 2>&1 | tee /dev/stderr)"
# Lint
lint: lint:
$(if $(GOLINT), , \ $(if $(GOLINT), , \
$(error Please install golint: go get -u github.com/golang/lint/golint)) $(error Please install golint: go get -u github.com/golang/lint/golint))