From 48b5bef8c8ec94f164a82179106214b4c5b90abf Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 11 Aug 2019 13:37:35 +0700 Subject: [PATCH] use travis-retry for downloading remote resources --- .travis.yml | 12 +++++++++--- .travis/script.sh | 2 -- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a57287e6..1642d2ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,16 +24,22 @@ env: # second part of the GOARCH workaround # now actually set the GOARCH env variable to the value of the temporary variable set earlier before_install: - - go get golang.org/x/tools/cmd/cover - - go get github.com/onsi/ginkgo/ginkgo - - go get github.com/onsi/gomega + - travis_retry go get golang.org/x/tools/cmd/cover + - travis_retry go get github.com/onsi/ginkgo/ginkgo + - travis_retry go get github.com/onsi/gomega - export GOARCH=$TRAVIS_GOARCH - go env # for debugging + - travis_retry go get -t ./... - "export DISPLAY=:99.0" - "Xvfb $DISPLAY &> /dev/null &" script: + - | + if [ ${TESTMODE} == "lint" ]; then + travis_retry curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.15.0 + fi - .travis/script.sh + after_success: - .travis/after_success.sh diff --git a/.travis/script.sh b/.travis/script.sh index 86886c9e..a9f460d9 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -2,9 +2,7 @@ set -ex -go get -t ./... if [ ${TESTMODE} == "lint" ]; then - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.15.0 ./bin/golangci-lint run ./... fi