From ad9f41a0cdcd21cf4238468bee74b9da7e103ef5 Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Sun, 13 Oct 2019 16:56:28 -0700 Subject: [PATCH] pull all the install into a single location --- .travis.yml | 7 ------- travis/install.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02f520b..8e24070 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,6 @@ go: [1.11.x, 1.12.x, 1.13.x] os: [linux, osx] install: - ./travis/install.sh - - if [[ "$GO111MODULE" == "on" ]]; then go mod download; fi - - if [[ "$GO111MODULE" == "off" ]]; then go get \ - github.com/stretchr/testify/assert \ - golang.org/x/sys/unix \ - github.com/konsorten/go-windows-terminal-sequences \ - github.com/hashicorp/go-version \ - github.com/hashicorp/go-version; fi script: - ./travis/cross_build.sh - export GOMAXPROCS=4 diff --git a/travis/install.sh b/travis/install.sh index 51b62a9..eaa511a 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -9,3 +9,12 @@ if [[ "$TRAVIS_GO_VERSION" =~ ^1\.12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; go build ./ popd fi + +if [[ "$GO111MODULE" == "on" ]]; then + go mod download +fi + +if [[ "$GO111MODULE" == "off" ]]; then + go get github.com/stretchr/testify/assert golang.org/x/sys/unix github.com/konsorten/go-windows-terminal-sequences + go get github.com/hashicorp/go-version github.com/hashicorp/go-version +fi