diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a54bfefd1db30f4d2f5bb964f4f2f9f0aa33f23..00f877956803bc99cc0e9b1cf2b317c47652a81a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ cache: variables: REPO_DIR: gitlab.com/elixxir REPO_NAME: registration - DOCKER_IMAGE: golang:1.13.4-buster + DOCKER_IMAGE: elixxirlabs/cuda-go:latest MIN_CODE_COVERAGE: "0.0" before_script: @@ -23,7 +23,7 @@ before_script: - chmod 700 ~/.ssh - ssh-keyscan -t rsa gitlab.com > ~/.ssh/known_hosts - 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/* stages: @@ -52,13 +52,9 @@ test: except: - tags script: - - GO111MODULE=off go get -u github.com/haya14busa/goverage - - apt-get update - - apt-get install bc -y - - mkdir -p testdata # Test coverage - - goverage -coverprofile=testdata/coverage-real.out -v ./... 2>&1 | grep -v "no packages being tested depend on" + - go-acc --covermode atomic --output testdata/coverage.out ./... -- -v # Exclude cmd from test coverage as it is command line related tooling # - grep -v -e cmd testdata/coverage.out > testdata/coverage-real.out - go tool cover -func=testdata/coverage-real.out