From 0329b9d8bfa39d5ebadbd794f3409a0bbf95795d Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Sat, 30 Apr 2022 08:53:13 +0200 Subject: [PATCH] chore(project): remove usage of gover (#1001) also, upload `coverprofile.out` (instead of `coverage.txt` which was empty) to codecov.io Fixes #1000 Signed-off-by: Xavier Coulon --- .github/workflows/ci-build.yml | 2 +- .gitignore | 1 + go.mod | 2 -- go.sum | 4 ---- make/test.mk | 8 +------- tools.go | 1 - 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 746fe880..9bab0443 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -53,7 +53,7 @@ jobs: uses: codecov/codecov-action@v1.0.6 with: # Path to coverage file to upload - file: coverage.txt + file: coverprofile.out golangci: name: Lint with Go ${{ matrix.go-version }} diff --git a/.gitignore b/.gitignore index 46e7b86a..e5cf4f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ coverage.txt *libasciidoc.html profile*.* !make/*.mk +coverprofile.out diff --git a/go.mod b/go.mod index 6d0addec..282b9f57 100644 --- a/go.mod +++ b/go.mod @@ -8,13 +8,11 @@ require ( github.com/google/go-cmp v0.5.5 github.com/kr/text v0.2.0 // indirect github.com/mna/pigeon v1.1.0 - github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/onsi/ginkgo/v2 v2.1.3 github.com/onsi/gomega v1.17.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.7.0 - github.com/sozorogami/gover v0.0.0-20171022184752-b58185e213c5 github.com/spf13/cobra v1.1.1 github.com/stretchr/testify v1.7.0 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect diff --git a/go.sum b/go.sum index 4a92d013..39b199ea 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,6 @@ github.com/mna/pigeon v1.1.0 h1:EjlvVbkGnNGemf8OrjeJX0nH8orujY/HkJgzJtd7kxc= github.com/mna/pigeon v1.1.0/go.mod h1:rkFeDZ0gc+YbnrXPw0q2RlI0QRuKBBPu67fgYIyGRNg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 h1:8Q0qkMVC/MmWkpIdlvZgcv2o2jrlF6zqVOh7W5YHdMA= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -212,8 +210,6 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sozorogami/gover v0.0.0-20171022184752-b58185e213c5 h1:TAPeDBsd52dRWoWzf5trgBzxzMYHTYjYI+4xNyCdoCU= -github.com/sozorogami/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:nHNlDYIQZn44RvqH0kCpl/dMMVWXkav0QIgzGxV1Ab4= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= diff --git a/make/test.mk b/make/test.mk index 8b0505b4..e5f503a6 100644 --- a/make/test.mk +++ b/make/test.mk @@ -4,11 +4,6 @@ install-ginkgo: @go install -v github.com/onsi/ginkgo/v2/ginkgo @ginkgo version -.PHONY: install-gover -## Install development tools. -install-gover: - @go install -v github.com/sozorogami/gover - .PHONY: test ## run all tests excluding fixtures and vendored packages test: clean generate-optimized install-ginkgo @@ -18,10 +13,9 @@ COVERPKGS := $(shell go list ./... | grep -v vendor | paste -sd "," -) .PHONY: test-with-coverage ## run all tests excluding fixtures and vendored packages -test-with-coverage: generate-optimized install-ginkgo install-gover +test-with-coverage: generate-optimized install-ginkgo @echo $(COVERPKGS) @ginkgo -r --randomize-all --randomize-suites --trace --race --compilers=0 --cover -coverpkg $(COVERPKGS) - @gover . coverage.txt .PHONY: test-fixtures ## run all fixtures tests diff --git a/tools.go b/tools.go index ee296891..e65aa7d7 100644 --- a/tools.go +++ b/tools.go @@ -5,5 +5,4 @@ package libasciidoc import ( _ "github.com/mna/pigeon" _ "github.com/onsi/ginkgo/v2/ginkgo" - _ "github.com/sozorogami/gover" )