Skip to content
Snippets Groups Projects
Commit 13890fed authored by Josh Brooks's avatar Josh Brooks
Browse files

Merge branch 'release' of gitlab.com:elixxir/client into release

parents 030ef956 092a5833
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,10 @@ before_script: ...@@ -26,7 +26,10 @@ before_script:
- chmod 700 ~/.ssh - chmod 700 ~/.ssh
- ssh-keyscan -t rsa gitlab.com > ~/.ssh/known_hosts - ssh-keyscan -t rsa gitlab.com > ~/.ssh/known_hosts
- git config --global url."git@gitlab.com:".insteadOf "https://gitlab.com/" - git config --global url."git@gitlab.com:".insteadOf "https://gitlab.com/"
- export GOFLAGS=-mod=vendor - export PATH=$HOME/go/bin:$PATH
- export GOPRIVATE=gitlab.com/elixxir/*
- go get -u github.com/ory/go-acc
stages: stages:
- setup - setup
...@@ -55,14 +58,13 @@ test: ...@@ -55,14 +58,13 @@ test:
except: except:
- tags - tags
script: script:
- GO111MODULE=off go get -u github.com/haya14busa/goverage
- apt-get update - apt-get update
- apt-get install bc -y - apt-get install bc -y
- mkdir -p testdata - mkdir -p testdata
# Test coverage # Test coverage
- goverage -coverprofile=testdata/coverage.out -v ./... 2>&1 | grep -v "no packages being tested depend on" - go-acc --covermode atomic --output testdata/coverage.out ./... -- -v
# Exclude some specific packages and files # Exclude some specific packages and files
- cat testdata/coverage.out | grep -v cmd | grep -v mockserver | grep -v pb[.]go | grep -v main.go > testdata/coverage-real.out - cat testdata/coverage.out | grep -v cmd | grep -v mockserver | grep -v pb[.]go | grep -v main.go > testdata/coverage-real.out
- go tool cover -func=testdata/coverage-real.out - go tool cover -func=testdata/coverage-real.out
......
...@@ -3,34 +3,21 @@ module gitlab.com/elixxir/client ...@@ -3,34 +3,21 @@ module gitlab.com/elixxir/client
go 1.13 go 1.13
require ( require (
cloud.google.com/go/pubsub v1.3.0 // indirect
dmitri.shuralyov.com/gpu/mtl v0.0.0-20191203043605-d42048ed14fd // indirect
github.com/cncf/udpa/go v0.0.0-20200124205748-db4b343e48c1 // indirect
github.com/envoyproxy/go-control-plane v0.9.4 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang/protobuf v1.3.4 github.com/golang/protobuf v1.4.0
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/pelletier/go-toml v1.6.0 // indirect github.com/pelletier/go-toml v1.6.0 // indirect
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/prometheus/client_model v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.5.2 // indirect
github.com/smartystreets/assertions v1.0.1 // indirect github.com/smartystreets/assertions v1.0.1 // indirect
github.com/spf13/afero v1.2.2 // indirect github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v0.0.5 github.com/spf13/cobra v1.0.0
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2 github.com/spf13/viper v1.6.2
github.com/stretchr/objx v0.2.0 // indirect
gitlab.com/elixxir/comms v0.0.0-20200415204952-6d63dd94a0ea gitlab.com/elixxir/comms v0.0.0-20200415204952-6d63dd94a0ea
gitlab.com/elixxir/crypto v0.0.0-20200410231849-90e859940f5d gitlab.com/elixxir/crypto v0.0.0-20200410231849-90e859940f5d
gitlab.com/elixxir/primitives v0.0.0-20200410231944-a57d71d577c9 gitlab.com/elixxir/primitives v0.0.0-20200410231944-a57d71d577c9
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect
golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
golang.org/x/mobile v0.0.0-20200222142934-3c8601c510d0 // indirect
golang.org/x/tools v0.0.0-20200309162502-c94e1fe1450c // indirect
gopkg.in/ini.v1 v1.52.0 // indirect gopkg.in/ini.v1 v1.52.0 // indirect
rsc.io/sampler v1.99.99 // indirect
) )
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment