From f9dea8b001c3094dbbcce64088ed647fb9bd1452 Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Wed, 2 Sep 2020 10:10:25 -0700 Subject: [PATCH] Use shared script for uploading to coveralls (#1191) * Use shared script for uploading to coveralls * Add project parameter to coverage script call --- Makefile | 2 +- build/bin/coveralls-coverage | 9 --------- go.mod | 4 +++- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100755 build/bin/coveralls-coverage diff --git a/Makefile b/Makefile index 24408a019..c79e841ab 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ test: build deps linters license_check coverage: # @HELP generate unit test coverage data coverage: build deps linters license_check - ./build/bin/coveralls-coverage + ./../build-tools/build/coveralls/coveralls-coverage onos-config deps: # @HELP ensure that the required dependencies are in place go build -v ./... diff --git a/build/bin/coveralls-coverage b/build/bin/coveralls-coverage deleted file mode 100755 index d5cef759a..000000000 --- a/build/bin/coveralls-coverage +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -go get github.com/go-playground/overalls && go get github.com/mattn/goveralls - -overalls -project=$GOPATH/src/github.com/onosproject/onos-config -concurrency 2 -covermode=count -ignore=".git,vendor,models,tools" -mv overalls.coverprofile overalls.coverprofile.orig -grep -v .pb.go overalls.coverprofile.orig >overalls.coverprofile -goveralls -coverprofile=overalls.coverprofile -service travis-ci diff --git a/go.mod b/go.mod index 2544b6ddc..6cef258e0 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/onosproject/onos-config go 1.14 require ( - cloud.google.com/go v0.43.0 // indirect github.com/atomix/go-client v0.2.2 github.com/cenkalti/backoff v2.2.1+incompatible @@ -11,9 +10,11 @@ require ( github.com/gogo/protobuf v1.3.1 github.com/golang/mock v1.3.1 github.com/golang/protobuf v1.3.3 + github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect github.com/google/uuid v1.1.1 github.com/googleapis/gnostic v0.3.0 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/kr/pty v1.1.8 // indirect github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/onosproject/config-models/modelplugin/devicesim-1.0.0 v0.0.0-20200303111912-723f2289d4c2 @@ -33,6 +34,7 @@ require ( github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.5.1 go.uber.org/multierr v1.4.0 // indirect + golang.org/x/mobile v0.0.0-20190806162312-597adff16ade // indirect golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 // indirect google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce // indirect google.golang.org/grpc v1.27.1