From 555a46d8f8f677f21dc5583622213d0dc9385733 Mon Sep 17 00:00:00 2001 From: Ying Li Date: Mon, 30 Nov 2015 15:32:22 -0800 Subject: [PATCH 1/2] Re-enable pushing coverage reports to codecov.io Signed-off-by: Ying Li --- Makefile | 2 +- circle.yml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8e221985ca..6a0cf2be9d 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ _space := $(empty) $(empty) # go cover test variables COVERDIR=.cover -COVERPROFILE=$(COVERDIR)/cover.out +COVERPROFILE?=$(COVERDIR)/cover.out COVERMODE=count PKGS = $(shell go list ./... | tr '\n' ' ') diff --git a/circle.yml b/circle.yml index a40e94b5c5..038f161911 100644 --- a/circle.yml +++ b/circle.yml @@ -16,6 +16,8 @@ machine: BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR # Workaround Circle parsing dumb bugs and/or YAML wonkyness CIRCLE_PAIN: "mode: set" + # Put the coverage profile somewhere codecov's script can find it + COVERPROFILE: coverage.out hosts: # Not used yet @@ -69,11 +71,10 @@ test: timeout: 600 pwd: $BASE_STABLE - post: - gvm use stable && make covmerge: timeout: 600 pwd: $BASE_STABLE # Report to codecov.io - # - bash <(curl -s https://codecov.io/bash): - # pwd: $BASE_STABLE + - bash <(curl -s https://codecov.io/bash): + pwd: $BASE_STABLE From 9c8e084e0df65a725e788cf68ebc4f600cc94328 Mon Sep 17 00:00:00 2001 From: Ying Li Date: Wed, 2 Dec 2015 10:02:24 -0800 Subject: [PATCH 2/2] Run coverage merge and reporting on all parallel containers. Signed-off-by: Ying Li --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 038f161911..10a28305d3 100644 --- a/circle.yml +++ b/circle.yml @@ -71,10 +71,13 @@ test: timeout: 600 pwd: $BASE_STABLE + post: - gvm use stable && make covmerge: timeout: 600 + parallel: true pwd: $BASE_STABLE # Report to codecov.io - bash <(curl -s https://codecov.io/bash): + parallel: true pwd: $BASE_STABLE