beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #41151 from thaJeztah/fix_gotestsum_install_again

Browse source
This commit is contained in:
Brian Goff 2020-06-29 09:38:42 -07:00 committed by GitHub
commit a70842f9c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Dockerfile.windows
View file

@ -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..."'; `
} `

4
hack/dockerfile/install/gotestsum.installer
View file

@ -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}"
)