File tree Expand file tree Collapse file tree 1 file changed +10
-4
lines changed Expand file tree Collapse file tree 1 file changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -29,12 +29,18 @@ export GIMME_ENV_PREFIX=./bin/.gimme/
2929export GIMME_SILENT_ENV=y
3030
3131# only setup go if we haven't set FORCE_HOST_GO, or `go version` doesn't match
32- # go version output looks like:
33- # go version go1.14.5 darwin/amd64
34- if ! ([ -n " ${FORCE_HOST_GO:- } " ] || \
35- (command -v go > /dev/null && [ " $( go version | cut -d' ' -f3) " = " go${GO_VERSION} " ])); then
32+ if [ -n " ${FORCE_HOST_GO:- } " ]; then
33+ GOTOOLCHAIN=" ${GOTOOLCHAIN:- local} "
34+ export GOTOOLCHAIN
35+ else
36+ GOTOOLCHAIN=" go${GO_VERSION} "
37+ export GOTOOLCHAIN
38+ # go version output looks like:
39+ # go version go1.14.5 darwin/amd64
40+ if ! (command -v go > /dev/null && [ " $( go version | cut -d' ' -f3) " = " go${GO_VERSION} " ]); then
3641 # eval because the output of this is shell to set PATH etc.
3742 eval " $( hack/third_party/gimme/gimme " ${GO_VERSION} " ) "
43+ fi
3844fi
3945
4046# force go modules
You can’t perform that action at this time.
0 commit comments