diff --git a/Dockerfile.windows b/Dockerfile.windows index 1cf665c9f6..7aebec082c 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -262,15 +262,12 @@ RUN ` RUN ` Function Build-GoTestSum() { ` Write-Host "INFO: Building gotestsum version $Env:GOTESTSUM_COMMIT in $Env:GOPATH"; ` - $env:GO111MODULE = 'on'; ` - &go get -d "gotest.tools/gotestsum@${Env:GOTESTSUM_COMMIT}"; ` - $env:GO111MODULE = 'off'; ` - if ($LASTEXITCODE -ne 0) { ` - Throw '"Failed getting gotestsum sources..."' ` - }; ` - $env:GO111MODULE = 'on'; ` - &go build -buildmode=exe -o "${Env:GOPATH}\bin\gotestsum.exe" gotest.tools/gotestsum; ` - $env:GO111MODULE = 'off'; ` + $Env:GO111MODULE = 'on'; ` + $tmpGobin = "${Env:GOBIN_TMP}"; ` + $Env:GOBIN = """${Env:GOPATH}`\bin"""; ` + &go get -buildmode=exe "gotest.tools/gotestsum@${Env:GOTESTSUM_COMMIT}"; ` + $Env:GOBIN = "${tmpGobin}"; ` + $Env:GO111MODULE = 'off'; ` if ($LASTEXITCODE -ne 0) { ` Throw '"gotestsum build failed..."'; ` } ` diff --git a/hack/dockerfile/install/gotestsum.installer b/hack/dockerfile/install/gotestsum.installer index 45b747dbf9..7bde0b1aab 100755 --- a/hack/dockerfile/install/gotestsum.installer +++ b/hack/dockerfile/install/gotestsum.installer @@ -5,7 +5,5 @@ install_gotestsum() ( set -e export GO111MODULE=on - go get -d "gotest.tools/gotestsum@${GOTESTSUM_COMMIT}" - go build ${GO_BUILDMODE} -o "${PREFIX}/gotestsum" 'gotest.tools/gotestsum' - + GOBIN="${PREFIX}" go get "gotest.tools/gotestsum@${GOTESTSUM_COMMIT}" )