From b13426e31b1ca788d4d778fd77fdb03c83c80b90 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 9 Aug 2022 16:37:25 +0200 Subject: [PATCH 1/6] Remove debug output when coverage fails When coverage fails, it logs megabytes of debug to stdout, which seems to break the drone ui as well as the log output download in drone, presumably because of the size. I think with removal of this print, we should still see any errors created by gocovmerge.go, but a few CI runs may be necessary to get it to fail again. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 77aac782e1133..95b4fffa1d4ad 100644 --- a/Makefile +++ b/Makefile @@ -364,7 +364,7 @@ test\#%: coverage: grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' coverage.out > coverage-bodged.out grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' integration.coverage.out > integration.coverage-bodged.out - $(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all || (echo "gocovmerge failed"; echo "integration.coverage.out"; cat integration.coverage.out; echo "coverage.out"; cat coverage.out; exit 1) + $(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all) .PHONY: unit-test-coverage unit-test-coverage: From 33d9be9c8d4dbe06eb8bd315f6fd52e974808bd3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 9 Aug 2022 19:55:27 +0200 Subject: [PATCH 2/6] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 95b4fffa1d4ad..44e245d22524f 100644 --- a/Makefile +++ b/Makefile @@ -364,7 +364,7 @@ test\#%: coverage: grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' coverage.out > coverage-bodged.out grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' integration.coverage.out > integration.coverage-bodged.out - $(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all) + $(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all .PHONY: unit-test-coverage unit-test-coverage: From fae9f963974cee992edecc647940bd2d880f321d Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 9 Aug 2022 21:45:10 +0200 Subject: [PATCH 3/6] restart ci From 94cb5d8d7902d4b629d5ae8c1897b4391c5ac786 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 10 Aug 2022 11:27:43 +0200 Subject: [PATCH 4/6] restart ci From 6dc5acf3ed7d2a9d9c96ab94fd6420f2703afef8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 10 Aug 2022 18:51:31 +0200 Subject: [PATCH 5/6] restart ci From 3c6b5f6231b1dadf42866afd9cf02f1430a32f96 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 10 Aug 2022 21:33:04 +0200 Subject: [PATCH 6/6] restart ci