From 08cf62cb808b9359a35cd5fac4ee648c9ef836f6 Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Sun, 13 Oct 2019 17:02:25 -0700 Subject: [PATCH] This should make gox a little nicer --- travis/cross_build.sh | 2 +- travis/install.sh | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/travis/cross_build.sh b/travis/cross_build.sh index 1ba63ab..824b4ee 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 - /tmp/gox/gox -build-lib -all + $(go env GOPATH)/bin/gox -build-lib fi diff --git a/travis/install.sh b/travis/install.sh index eaa511a..70aa0a4 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -3,11 +3,7 @@ set -e 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 - go build ./ - popd + GO111MODULE=off go get github.com/dgsb/gox fi if [[ "$GO111MODULE" == "on" ]]; then @@ -16,5 +12,4 @@ 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