From f3ac378ca4f670a6504d5138278bb33104eade0a Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 5 Feb 2015 17:13:51 -0600 Subject: [PATCH 1/4] No long use v1 branch of qml repo --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4659503e90..1a7e69ecb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ install: # - go get golang.org/x/tools/cmd/vet - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - go get github.com/mattn/goveralls - - go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR - - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get -d $ETH_DEPS; fi + - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get -d -v $ETH_DEPS; fi before_script: - gofmt -l -w . - goimports -l -w . From b58b6b9bac156035d416b5c837b49baa769b2db3 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 5 Feb 2015 17:23:22 -0600 Subject: [PATCH 2/4] Use after_success build step --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a7e69ecb6..f51f2cfbdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,9 @@ before_script: # - go vet ./... # - go test -race ./... script: - - ./gocoverage.sh && if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi + - ./gocoverage.sh +after_success: + - if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi env: global: - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig From 5e0b2b260c9e6fb27826ca16e9d49f370df56b78 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 5 Feb 2015 17:49:44 -0600 Subject: [PATCH 3/4] Updated go list command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f51f2cfbdd..e8716ee68d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: # - go get golang.org/x/tools/cmd/vet - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - go get github.com/mattn/goveralls - - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get -d -v $ETH_DEPS; fi + - DEPS=$(go list -f '{{.Imports}}' ./... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$DEPS" ]; then go get -d -v $DEPS; fi before_script: - gofmt -l -w . - goimports -l -w . From e4bb419707ae0cde8a19f79154d5715d0ce1d6df Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 5 Feb 2015 18:11:31 -0600 Subject: [PATCH 4/4] Add go check to prefetched test dependencies --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e8716ee68d..0084bf9c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ install: # - go get golang.org/x/tools/cmd/vet - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - go get github.com/mattn/goveralls + - go get gopkg.in/check.v1 - DEPS=$(go list -f '{{.Imports}}' ./... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$DEPS" ]; then go get -d -v $DEPS; fi before_script: - gofmt -l -w .