Skip to content

Windows: appveyor: Build shim binary from Microsoft/hcsshim repo#3128

Merged
jterry75 merged 2 commits intocontainerd:masterfrom
lowenna:jjh/ci
Mar 26, 2019
Merged

Windows: appveyor: Build shim binary from Microsoft/hcsshim repo#3128
jterry75 merged 2 commits intocontainerd:masterfrom
lowenna:jjh/ci

Conversation

@lowenna
Copy link
Copy Markdown

@lowenna lowenna commented Mar 25, 2019

Signed-off-by: John Howard [email protected]

  • Revendor Microsoft/hcsshim
  • Update appveyor to build containerd-shim-runhcs-v1.exe and runhcs.exe from hcsshim repo
  • Bumps appveyor to golang 1.12.1

This is a phased approach to removing the existing "v1" shim code for Windows from the containerd repo in preparation for v1.3. This first step ensures that the shim (and runhcs.exe although that will be removed later) are built during CI from the commit of hcsshim in the vendor.conf file.

Note that although built, this first step does not update the test scripts execution lines to include the path of the built binaries, so they will still use the shim binary build from the containerd/containerd repo.

@lowenna lowenna force-pushed the jjh/ci branch 7 times, most recently from 6a93bc0 to 6af44fc Compare March 25, 2019 18:09
Signed-off-by: John Howard <[email protected]>
@lowenna lowenna force-pushed the jjh/ci branch 15 times, most recently from c55af66 to 8040e2b Compare March 25, 2019 21:07
@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 25, 2019

Codecov Report

Merging #3128 into master will increase coverage by 3.99%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3128      +/-   ##
==========================================
+ Coverage   43.58%   47.57%   +3.99%     
==========================================
  Files         104       93      -11     
  Lines       11156     8608    -2548     
==========================================
- Hits         4862     4095     -767     
+ Misses       5555     3783    -1772     
+ Partials      739      730       -9
Flag Coverage Δ
#linux 47.57% <ø> (ø) ⬆️
#windows ?
Impacted Files Coverage Δ
remotes/docker/auth.go 63.82% <0%> (-3.97%) ⬇️
remotes/docker/status.go 21.42% <0%> (-3.58%) ⬇️
platforms/cpuinfo.go 3.77% <0%> (-0.85%) ⬇️
log/context.go 36.84% <0%> (-0.66%) ⬇️
namespaces/context.go 55% <0%> (-0.56%) ⬇️
errdefs/grpc.go 74.6% <0%> (-0.4%) ⬇️
remotes/docker/pusher.go 0% <0%> (ø) ⬆️
content/local/locks.go 100% <0%> (ø) ⬆️
labels/validate.go 100% <0%> (ø) ⬆️
platforms/defaults.go 100% <0%> (ø) ⬆️
... and 61 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68c44f8...8710940. Read the comment docs.

@lowenna lowenna force-pushed the jjh/ci branch 6 times, most recently from fde27da to 97065bc Compare March 25, 2019 21:46
@lowenna lowenna force-pushed the jjh/ci branch 8 times, most recently from af139b7 to c385ffc Compare March 25, 2019 22:49
Signed-off-by: John Howard <[email protected]>

This is part of a phased update to remove the existing Windows shim
code from the containerd repo, and instead use the one from Microsoft/hcsshim.
@lowenna lowenna changed the title DO NOT MERGE: Experimenting with appveyor Windows: appveyor: Build shim binary from Microsoft/hcsshim repo Mar 25, 2019
@lowenna
Copy link
Copy Markdown
Author

lowenna commented Mar 25, 2019

@jterry75 @dmcgowan @crosbymichael PTAL.

@jterry75
Copy link
Copy Markdown
Contributor

Thanks @jhowardmsft! This is a great first step!

LGTM

@jterry75 jterry75 added this to the 1.3-beta.0 milestone Mar 26, 2019
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants