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

Merge pull request #33234 from johnstep/ensure-correct-windows-client

Browse source 
Ensure the correct Windows client is built
This commit is contained in:
Sebastiaan van Stijn 2017-05-16 23:40:15 +02:00 committed by GitHub
commit 1290ec2d4b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hack/make.ps1
View file

@ -418,8 +418,10 @@ Try {
Invoke-Expression "git -C $dockerCliRoot checkout -q $dockerCliCommit" Invoke-Expression "git -C $dockerCliRoot checkout -q $dockerCliCommit"
if ($LASTEXITCODE -ne 0) { Throw "Failed to checkout client commit $dockerCliCommit" } if ($LASTEXITCODE -ne 0) { Throw "Failed to checkout client commit $dockerCliCommit" }
Write-Host "INFO: Building client..." Write-Host "INFO: Building client..."
Invoke-Expression "go build -o $root\bundles\docker.exe github.com/docker/cli/cmd/docker" Push-Location "$dockerCliRoot\cmd\docker"; $global:pushed=$True
Invoke-Expression "go build -o $root\bundles\docker.exe"
if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client" } if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client" }
Pop-Location; $global:pushed=$False
} }
Catch [Exception] { Catch [Exception] {
Throw $_ Throw $_