diff --git a/.travis.yml b/.travis.yml index 7fb79ff..02f520b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,12 @@ 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; 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/cross_build.sh b/travis/cross_build.sh index 545d8c3..1ba63ab 100755 --- a/travis/cross_build.sh +++ b/travis/cross_build.sh @@ -1,5 +1,5 @@ #!/bin/bash -if [[ "$TRAVIS_GO_VERSION" =~ ^1.\12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then +if [[ "$TRAVIS_GO_VERSION" =~ ^1\.12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then /tmp/gox/gox -build-lib -all fi diff --git a/travis/install.sh b/travis/install.sh index 07f4532..51b62a9 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -2,7 +2,7 @@ set -e -if [[ "$TRAVIS_GO_VERSION" =~ ^1.\12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then +if [[ "$TRAVIS_GO_VERSION" =~ ^1\.12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/dgsb/gox.git /tmp/gox pushd /tmp/gox git checkout new_master