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

Attempt to simplify pushing to codecov, since codecov can do merges. 

Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
Ying Li 2016-01-25 15:18:24 -08:00
parent b51d1e8cf8
commit a1aa4d7078
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -118,13 +118,13 @@ protos:
# be run first # be run first
define gocover define gocover
$(GO_EXC) test $(OPTS) $(TESTOPTS) -covermode="$(COVERMODE)" -coverprofile="$(COVERDIR)/$(subst /,-,$(1)).$(subst $(_space),.,$(NOTARY_BUILDTAGS)).cover" "$(1)" || exit 1; $(GO_EXC) test $(OPTS) $(TESTOPTS) -covermode="$(COVERMODE)" -coverprofile="$(COVERDIR)/$(subst /,-,$(1)).$(subst $(_space),.,$(NOTARY_BUILDTAGS)).coverage.txt" "$(1)" || exit 1;
endef endef
gen-cover: go_version gen-cover: go_version
@mkdir -p "$(COVERDIR)" @mkdir -p "$(COVERDIR)"
$(foreach PKG,$(PKGS),$(call gocover,$(PKG))) $(foreach PKG,$(PKGS),$(call gocover,$(PKG)))
rm "$(COVERDIR)"/*testutils*.cover rm "$(COVERDIR)"/*testutils*.coverage.txt
# Generates the cover binaries and runs them all in serial, so this can be used # Generates the cover binaries and runs them all in serial, so this can be used
# run all tests with a yubikey without any problems # run all tests with a yubikey without any problems

10
circle.yml
View File

@ -18,6 +18,8 @@ machine:
CIRCLE_PAIN: "mode: set" CIRCLE_PAIN: "mode: set"
# Put the coverage profile somewhere codecov's script can find it # Put the coverage profile somewhere codecov's script can find it
COVERPROFILE: coverage.out COVERPROFILE: coverage.out
# Set the pull request number so codecov can figure it out
PULL_REQUEST: ${CI_PULL_REQUEST##*/}
hosts: hosts:
# Not used yet # Not used yet
@ -40,8 +42,7 @@ dependencies:
# For the stable go version, additionally install linting tools # For the stable go version, additionally install linting tools
- > - >
gvm use stable && gvm use stable &&
go get github.com/golang/lint/golint github.com/wadey/gocovmerge && go get github.com/golang/lint/golint
go install github.com/wadey/gocovmerge
test: test:
pre: pre:
# Output the go versions we are going to test # Output the go versions we are going to test
@ -72,11 +73,6 @@ test:
pwd: $BASE_STABLE pwd: $BASE_STABLE
post: post:
- gvm use stable && make covmerge:
timeout: 600
parallel: true
pwd: $BASE_STABLE
# Report to codecov.io # Report to codecov.io
- bash <(curl -s https://codecov.io/bash): - bash <(curl -s https://codecov.io/bash):
parallel: true parallel: true