Add appveyor setup to build and unit test by vdemeester · Pull Request #905 · docker/cli

vdemeester · 2018-02-27T13:12:57Z

The next step is to run e2e tests on windows too.

Adds a make.ps1 powershell script to make it easy to compile and test.

.\scripts\make.ps1 -Binary
INFO: make.ps1 starting at 03/01/2018 14:37:28
INFO: Building...

 ________   ____  __.
 \_____  \ |    |/ _|
 /   |   \|      <
 /    |    \    |  \
 \_______  /____|__ \
         \/        \/

INFO: make.ps1 ended at 03/01/2018 14:37:30

.\scripts\make.ps1 -TestUnit

Related to #457

Signed-off-by: Vincent Demeester vincent@sbr.pm

vdemeester · 2018-02-27T13:15:06Z

Now the main question, is how to make appveyor build this pull-request… 🤔

codecov-io · 2018-02-27T16:17:10Z

Codecov Report

Merging #905 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #905      +/-   ##
==========================================
- Coverage   53.55%   53.54%   -0.02%     
==========================================
  Files         262      262              
  Lines       16602    16602              
==========================================
- Hits         8891     8889       -2     
- Misses       7121     7122       +1     
- Partials      590      591       +1

dnephin · 2018-02-27T19:12:55Z

I created https://ci.appveyor.com/project/docker/cli but I think someone may still need to add the github webhook

dnephin · 2018-02-27T19:17:17Z

+
+test_script:
+  - go build github.com/docker/cli/cmd/docker
+  - for /f "" %%G in ('go list github.com/docker/cli/...') do ( go test %%G & IF ERRORLEVEL == 1 EXIT 1)


I think we can still use bash, ex: https://github.com/stedolan/jq/blob/master/appveyor.yml, https://github.com/containerd/containerd/blob/master/.appveyor.yml

another example: https://github.com/gotestyourself/gotestyourself/pull/69/files#diff-180360612c6b8c4ed830919bbb4dd459R22

dnephin · 2018-02-27T22:03:12Z

The hook is added, so this is running now!

(I rebased and force pushed to trigger the build)

vdemeester · 2018-02-28T07:30:04Z

I'll add commits from #906 here I think (to make the first run green 👼)

dnephin · 2018-02-28T21:36:23Z

+  - rmdir c:\go /s /q
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.msi
+  - msiexec /i go%GOVERSION%.windows-amd64.msi /q
+  - set Path=c:\go\bin;c:\gopath\bin;C:\Program Files (x86)\Bazaar\;C:\Program Files\Mercurial\%Path%


I don't think this line is necessary. At least no the Bazaar/Mercurial parts

dnephin · 2018-02-28T21:37:13Z

+
+test_script:
+  - go build github.com/docker/cli/cmd/docker
+  - for /f "" %%G in ('go list github.com/docker/cli/...') do ( go test %%G & IF ERRORLEVEL == 1 EXIT 1)


another example: https://github.com/gotestyourself/gotestyourself/pull/69/files#diff-180360612c6b8c4ed830919bbb4dd459R22

dnephin · 2018-03-06T16:34:44Z

Sorry about conflicts from the gotestyourself/assert PR.

dnephin · 2018-03-06T16:37:29Z

 }

 func TestLoadKeyFromPath(t *testing.T) {
+	skip.If(t, func() bool { return runtime.GOOS == "windows" })


The func() bool {} can be removed here, and below.

dnephin · 2018-03-06T16:38:18Z

 }
+
+func fullExampleYAML(workingDir, homeDir string) string {
+	return fmt.Sprintf(string(`version: "3.6"


The string() cast is unnecessary here

dnephin · 2018-03-06T16:38:40Z

@@ -0,0 +1 @@
+package client


empty file can be removed

dnephin · 2018-03-06T16:39:37Z

+
+             Usage Examples (run from repo root):
+                "hack\make.ps1 -Client" to build docker.exe client 64-bit binary (remote repo)
+                "hack\make.ps1 -TestUnit" to run unit tests


old comments, wrong path.

justincormack · 2018-03-06T16:51:16Z

@@ -0,0 +1,197 @@
+<#
+.NOTES
+    Author:  @vdemeester


files shouldnt have authors, all the maintainers are responsible

justincormack · 2018-03-06T16:52:20Z

+    if (-not (Test-Path ".\.git")) {
+        # If we don't have a .git directory, but we do have the environment
+        # variable DOCKER_GITCOMMIT set, that can override it.
+        if ($env:DOCKER_GITCOMMIT.Length -eq 0) {


I think you can use $env:DOCKER_GITCOMMIT -eq $null it is more idiomatic for powershell

justincormack · 2018-03-06T16:56:03Z

Needs a rebase

dnephin · 2018-03-06T21:16:01Z

Rebased, and fixed most of my comments (didn't touch the powershell)

Adds a `make.ps1` powershell script to make it easy to compile and test. ``` .\scripts\make.ps1 -Binary INFO: make.ps1 starting at 03/01/2018 14:37:28 INFO: Building... ________ ____ __. \_____ \ | |/ _| / | \| < / | \ | \ \_______ /____|__ \ \/ \/ INFO: make.ps1 ended at 03/01/2018 14:37:30 .\scripts\make.ps1 -TestUnit ``` The next step is to run e2e tests on windows too. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Some of them are skipped for now (because the feature is not supported or needs more work), some of them are fixed. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

vdemeester · 2018-03-07T17:18:43Z

@justincormack @dnephin rebased and updated the powershell 👼

dnephin

LGTM

mat007 · 2018-03-08T06:11:20Z

+
+install:
+  - rmdir c:\go /s /q
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.msi


Shouldn't that be prefixed with appveyor-retry just to be on the safe side ?

@mat007 noted, thanks 😛 We never had any problem so far with that, so I'm fine merging like this. But if somehow it turns out we need to be more on the safe side, we'll use appveyor-retry then 😉

thaJeztah

LGTM

GordonTheTurtle added the status/0-triage label Feb 27, 2018

vdemeester added status/2-code-review and removed status/0-triage labels Feb 27, 2018

dnephin reviewed Feb 27, 2018

View reviewed changes

dnephin force-pushed the appveyor-setup branch from 44f9442 to ebd12da Compare February 27, 2018 22:02

vdemeester force-pushed the appveyor-setup branch from 855427e to e1165f5 Compare February 28, 2018 14:31

vdemeester mentioned this pull request Feb 28, 2018

Fixes some unit tests to be able to run them on windows #906

Closed

vdemeester force-pushed the appveyor-setup branch 3 times, most recently from 747906c to d21fb09 Compare February 28, 2018 15:18

dnephin reviewed Feb 28, 2018

View reviewed changes

vdemeester force-pushed the appveyor-setup branch 4 times, most recently from 6c024d4 to 6501571 Compare March 1, 2018 10:50

vdemeester changed the title ~~Add appveyor setup to build and unit test~~ [wip] Add appveyor setup to build and unit test Mar 1, 2018

vdemeester force-pushed the appveyor-setup branch 7 times, most recently from 6e32e06 to 5a17a97 Compare March 1, 2018 14:31

vdemeester changed the title ~~[wip] Add appveyor setup to build and unit test~~ Add appveyor setup to build and unit test Mar 1, 2018

vdemeester force-pushed the appveyor-setup branch from 5a17a97 to 3a28973 Compare March 1, 2018 14:43

vdemeester force-pushed the appveyor-setup branch from 3a28973 to e70a278 Compare March 2, 2018 10:36

dnephin reviewed Mar 6, 2018

View reviewed changes

justincormack reviewed Mar 6, 2018

View reviewed changes

dnephin force-pushed the appveyor-setup branch from e70a278 to 8fa00b4 Compare March 6, 2018 21:16

vdemeester added 3 commits March 7, 2018 18:14

Fixes some unit tests to be able to run them on windows

0cf2e63

Some of them are skipped for now (because the feature is not supported or needs more work), some of them are fixed. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Remove unused powershell function

10baa75

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

vdemeester force-pushed the appveyor-setup branch from c22816a to 10baa75 Compare March 7, 2018 17:18

dnephin approved these changes Mar 7, 2018

View reviewed changes

mat007 reviewed Mar 8, 2018

View reviewed changes

thaJeztah approved these changes Mar 8, 2018

View reviewed changes

thaJeztah merged commit 310127a into docker:master Mar 8, 2018

GordonTheTurtle added this to the 18.04.0 milestone Mar 8, 2018

vdemeester deleted the appveyor-setup branch March 8, 2018 08:51

thaJeztah added the area/testing label Mar 14, 2018

thaJeztah mentioned this pull request Apr 10, 2018

[18.03] backport content trust tests, windows, test-refactoring docker-archive/docker-ce#504

Merged

thaJeztah added the process/cherry-picked label Apr 30, 2018

thaJeztah mentioned this pull request Jun 11, 2018

Bump Golang to 1.10.3 #1122

Merged

thaJeztah mentioned this pull request Oct 19, 2023

cli/compose/loader: use gotest.tools/v3/golden #4610

Merged

Conversation

vdemeester commented Feb 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vdemeester commented Feb 27, 2018

Uh oh!

codecov-io commented Feb 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dnephin commented Feb 27, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dnephin commented Feb 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vdemeester commented Feb 28, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dnephin commented Mar 6, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

justincormack Mar 6, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

justincormack commented Mar 6, 2018

Uh oh!

dnephin commented Mar 6, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vdemeester commented Mar 7, 2018

Uh oh!

dnephin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

vdemeester commented Feb 27, 2018 •

edited

Loading

codecov-io commented Feb 27, 2018 •

edited

Loading

dnephin commented Feb 27, 2018 •

edited

Loading

justincormack Mar 6, 2018 •

edited

Loading

dnephin commented Mar 6, 2018 •

edited

Loading