diff --git a/.travis.yml b/.travis.yml index 968dc4f..86c31ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: go go: - - 1.4 + # Done as part of https://github.com/travis-ci/travis-ci/issues/9247 + - "1.10" sudo: false @@ -18,7 +19,7 @@ before_install: - curl -o gimme -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme - chmod u+x gimme - unset GOROOT GOTOOLDIR - - eval "$(./gimme 1.4)" + - eval "$(./gimme 1.10)" - go version - go env diff --git a/script/build b/script/build index d090551..dd12ca1 100755 --- a/script/build +++ b/script/build @@ -15,7 +15,8 @@ build() { # Check the go version EQ="=" - regex="(go[0-1].[0-4])" + # If we are golang <= 1.4, ' ' for EQ ... else '=' + regex="(go[0-1].[0-4](?![0-9]))" if [[ `go version` =~ $regex ]]; then EQ=" " fi