From 37a75e5e380f57cede2674688d7494b892b70803 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Sun, 27 May 2018 14:28:49 +0200 Subject: [PATCH 1/2] Test with Go 1.10 License: MIT Signed-off-by: Hector Sanjuan --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 96dca34d..bee07a87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ os: - linux # - osx go: -- '1.9' +- '1.10.x' services: - docker From 926a5e28cc3ce597e8e091c7a75fd2434c6876b4 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Sun, 27 May 2018 18:04:05 +0200 Subject: [PATCH 2/2] Remove coverage.sh. Go 1.10 supports a coverprofile from multiple packages. License: MIT Signed-off-by: Hector Sanjuan --- .travis.yml | 3 ++- coverage.sh | 32 -------------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100755 coverage.sh diff --git a/.travis.yml b/.travis.yml index bee07a87..a0a5f1b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,8 @@ jobs: - go get -u github.com/mattn/goveralls - go get -u golang.org/x/tools/cmd/cover - make deps - - ./coverage.sh + - go test -v -coverprofile=coverage.out -covermode=count ./... + - $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN - script: - go get -u github.com/mattn/goveralls - go get -u golang.org/x/tools/cmd/cover diff --git a/coverage.sh b/coverage.sh deleted file mode 100755 index 8a3fd6ae..00000000 --- a/coverage.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -echo "mode: count" > fullcov.out -dirs=$(find ./* -maxdepth 10 -type d ) -dirs=". $dirs" -for dir in $dirs; -do - if ls "$dir"/*.go &> /dev/null; - then - cmdflags="-v -coverprofile=profile.out -covermode=count $dir" - if [ "$dir" == "." ]; then - cmdflags="-v -coverprofile=profile.out -covermode=count -loglevel CRITICAL ." - fi - echo go test $cmdflags - go test $cmdflags - if [ $? -ne 0 ]; - then - exit 1 - fi - if [ -f profile.out ] - then - cat profile.out | grep -v "^mode: count" >> fullcov.out - fi - fi -done - -if [ -n $COVERALLS_TOKEN ]; -then - $HOME/gopath/bin/goveralls -coverprofile=fullcov.out -service=travis-ci -repotoken $COVERALLS_TOKEN -fi -rm -rf ./profile.out -rm -rf ./fullcov.out