diff --git a/Makefile b/Makefile index 514e00b20..6cca98f43 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ endif .build/deps-test-go.ok: go.mod go.sum @mkdir -p .build - GO111MODULE=on go install github.com/wadey/gocovmerge + GO111MODULE=on go install github.com/hansboder/gocovmerge touch $@ .build/deps-lint-go.ok: go.mod go.sum diff --git a/go.mod b/go.mod index 31c907eb1..cc83da1f0 100644 --- a/go.mod +++ b/go.mod @@ -22,6 +22,7 @@ require ( github.com/go-openapi/validate v0.19.7 github.com/golangci/golangci-lint v1.24.0 github.com/google/go-cmp v0.4.0 + github.com/hansboder/gocovmerge v0.0.0-20190813150856-3552c2006da5 github.com/hansrodtang/randomcolor v0.0.0-20160512071917-d27108b3d7a5 github.com/jarcoal/httpmock v1.0.5 github.com/knadh/koanf v0.9.1 @@ -34,7 +35,6 @@ require ( github.com/sirupsen/logrus v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.6.2 // indirect - github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect gopkg.in/go-playground/colors.v1 v1.2.0 gopkg.in/yaml.v2 v2.2.8 diff --git a/go.sum b/go.sum index 9248e5d55..322f45631 100644 --- a/go.sum +++ b/go.sum @@ -263,6 +263,8 @@ github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.m github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hansboder/gocovmerge v0.0.0-20190813150856-3552c2006da5 h1:PKFOvrFdBuYn8F0GD0itonb8M/DFiSrDYfF54DUIE3M= +github.com/hansboder/gocovmerge v0.0.0-20190813150856-3552c2006da5/go.mod h1:YuynvyiaysiM6eitHFN8mL+lRHEbZFTHG+hVXX1xZf8= github.com/hansrodtang/randomcolor v0.0.0-20160512071917-d27108b3d7a5 h1:9WT/rQ2tZI0TBZhBsA/dYU1bdI2QKaUzQ3X6YDwaLUY= github.com/hansrodtang/randomcolor v0.0.0-20160512071917-d27108b3d7a5/go.mod h1:XvzgNvkcPBKMxeywFlPioejZ5ulXi/GMLZDoBw915FA= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -476,8 +478,6 @@ github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad h1:W0LEBv82YCGEtcmPA3uNZBI33/qF//HAAs3MawDjRa0= -github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek= github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= diff --git a/tools.go b/tools.go index bc6677108..90ef30c33 100644 --- a/tools.go +++ b/tools.go @@ -10,5 +10,5 @@ import ( _ "github.com/elazarl/go-bindata-assetfs" _ "github.com/go-bindata/go-bindata/v3" _ "github.com/golangci/golangci-lint/pkg/commands" - _ "github.com/wadey/gocovmerge" + _ "github.com/hansboder/gocovmerge" )