Open platform to collect and prioritize feedback
Fix Coverage report (#142)
Guilherme Oenning51884048a8f1
diff --git a/.gitignore b/.gitignoreindex c3383caf1..dc1fcf302 100644--- a/.gitignore+++ b/.gitignore@@ -3,7 +3,6 @@ tmp/dist/output/node_modules/-*.coverprofile.vscode/fider@@ -14,10 +13,9 @@ gin-bin.exe~.envnpm-debug.log-coverage.txtprofile.outdebugdebug.test.DS_Store-.cover-cover.out\ No newline at end of file+cover.out+coverage.tmpdiff --git a/Makefile b/Makefileindex dec6e44ed..72b2a06da 100644--- a/Makefile+++ b/Makefile@@ -10,7 +10,9 @@ test:godotenv -f ${ENV_FILE} go test ./... -cover -p=1coverage:- godotenv -f ${ENV_FILE} ./cover.sh $$(go list ./... | grep -v /vendor/)+ echo 'mode: atomic' > cover.out+ go list ./... | xargs -n1 -I{} sh -c 'godotenv -f ${ENV_FILE} go test -covermode=atomic -coverpkg=./... -coverprofile=coverage.tmp {} && tail -n +2 coverage.tmp >> cover.out'+ rm coverage.tmpbuild:go build -a -ldflags='-X main.buildtime=${BUILD_TIME}' -o fider .diff --git a/cover.sh b/cover.shdeleted file mode 100755index 2df771a2d..000000000--- a/cover.sh+++ /dev/null@@ -1,55 +0,0 @@-#!/bin/bash--set -e--COVER=.cover-ROOT_PKG=github.com/getfider/fider/--if [[ -d "$COVER" ]]; then- rm -rf "$COVER"-fi-mkdir -p "$COVER"--i=0-for pkg in "$@"; do- i=$((i + 1))-- extracoverpkg=""- if [[ -f "$GOPATH/src/$pkg/.extra-coverpkg" ]]; then- extracoverpkg=$( \- sed -e "s|^|$pkg/|g" < "$GOPATH/src/$pkg/.extra-coverpkg" \- | tr '\n' ',')- fi-- coverpkg=$(go list -json "$pkg" | jq -r '- .Deps- | . + ["'"$pkg"'"]- | map- ( select(startswith("'"$ROOT_PKG"'"))- | select(contains("/vendor/") | not)- )- | join(",")- ')- testcoverpkg=$(go list -json "$pkg" | jq -r '- .XTestImports- | . + ["'"$pkg"'"]- | map- ( select(startswith("'"$ROOT_PKG"'"))- | select(contains("/vendor/") | not)- )- | join(",")- ')- if [[ -n "$extracoverpkg" ]]; then- coverpkg="$extracoverpkg$coverpkg"- fi-- args=""- if [[ -n "$coverpkg" ]]; then- args="-p=1 -coverprofile $COVER/cover.${i}.out -covermode=atomic -coverpkg $coverpkg,$testcoverpkg"- fi-- echo go test $args -v -race "$pkg"- go test $args -v -race "$pkg"-done--gocovmerge "$COVER"/*.out > cover.out\ No newline at end of filediff --git a/wercker.yml b/wercker.ymlindex 94b898b18..1d76379b5 100644--- a/wercker.yml+++ b/wercker.yml@@ -6,7 +6,7 @@ services:POSTGRES_PASSWORD: fider_test-pwbuild-assets:- box: node:8.1+ box: node:8.6steps:- npm-install@@ -28,7 +28,7 @@ test:steps:# Get dependencies- script:- name: get dotenv+ name: get dependenciescode: |go get github.com/joho/godotenv/cmd/godotenv@@ -48,18 +48,11 @@ coverage:box: golang:1.9base-path: /go/src/github.com/getfider/fidersteps:- # Install jq- - script:- name: install jq- code: |- curl -L http://stedolan.github.io/jq/download/linux64/jq -o /usr/local/bin/jq- chmod +x /usr/local/bin/jq# Get dependencies- script:name: get dependenciescode: |go get github.com/joho/godotenv/cmd/godotenv- go get github.com/wadey/gocovmerge# Publish to codecov.io- script: