From a6ae4b71409083f73676f5ccecb0244602fd74c3 Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Tue, 9 Nov 2021 10:21:31 +0100
Subject: [PATCH] feat: upload code coverage to code climate

---
 Makefile       | 26 ++++++++++++++++----------
 ci/Jenkinsfile |  6 +-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 350efd57..270b6dad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,9 @@
+
+CC_TEST_REPORTER_ID := 343d0af350b29aaf08d1e5bb4465d0e21df6298a27240acd2434457a9984c74a
+GO_HTML_COV         := ./coverage.html
+GO_TEST_OUTFILE     := ./c.out
+CC_PREFIX       	:= github.com/status-im/go-waku
+
 .PHONY: all build lint test coverage build-example
 
 all: build
@@ -19,7 +25,16 @@ lint:
 	@golangci-lint --exclude=SA1019 run ./... --deadline=5m
 
 test:
-	go test -v -failfast ./...
+	go test ./waku/... -coverprofile=${GO_TEST_OUTFILE}
+	go tool cover -html=${GO_TEST_OUTFILE} -o ${GO_HTML_COV}
+
+_before-cc:
+	CC_TEST_REPORTER_ID=${CC_TEST_REPORTER_ID} ./coverage/cc-test-reporter before-build
+	
+_after-cc:
+	CC_TEST_REPORTER_ID=${CC_TEST_REPORTER_ID} ./coverage/cc-test-reporter after-build --prefix ${CC_PREFIX}
+
+test-ci: _before-cc test _after-cc
 
 generate:
 	go generate ./waku/v2/protocol/pb/generate.go
@@ -28,15 +43,6 @@ coverage:
 	go test  -count 1 -coverprofile=coverage.out ./...
 	go tool cover -html=coverage.out -o=coverage.html
 
-codeclimate-coverage:
-	CC_TEST_REPORTER_ID=343d0af350b29aaf08d1e5bb4465d0e21df6298a27240acd2434457a9984c74a
-	GIT_COMMIT=$(git log | grep -m1 -oE '[^ ]+$')
-	./coverage/cc-test-reporter before-build;\
-	go test -count 1 -coverprofile coverage/cover.out ./...;\
-	go test -coverprofile coverage/cover.out -json ./... > coverage/coverage.json
-    EXIT_CODE=$$?;\
-	./coverage/cc-test-reporter after-build -t cover --exit-code $$EXIT_CODE || echo  “Skipping Code Climate coverage upload”
-
 # build a docker image for the fleet
 docker-image: DOCKER_IMAGE_TAG ?= latest
 docker-image: DOCKER_IMAGE_NAME ?= statusteam/go-waku:$(DOCKER_IMAGE_TAG)
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
index cc21f02f..f5383444 100644
--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -26,11 +26,7 @@ pipeline {
     }
 
     stage('Test') {
-      steps { sh 'make test' }
-    }
-
-    stage('Codeclimate') {
-      steps { sh 'make codeclimate-coverage' }
+      steps { sh 'make test-ci' }
     }
 
     stage('Build example') {