Skip to content

[release/1.2] cherry-pick: Appveyor fixes from master#3229

Merged
crosbymichael merged 2 commits intocontainerd:release/1.2from
estesp:fix-appveyor
Apr 18, 2019
Merged

[release/1.2] cherry-pick: Appveyor fixes from master#3229
crosbymichael merged 2 commits intocontainerd:release/1.2from
estesp:fix-appveyor

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Apr 18, 2019

Cherry-pick commits from #3222 for release/1.2

estesp and others added 2 commits April 18, 2019 11:26
Kill the underlying containerd after outputting error. Otherwise CI
hangs indefinitely and requires the CI infrastructure to kill the build
at the timeout expiration.

Signed-off-by: Wei Fu <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
@estesp
Copy link
Copy Markdown
Member Author

estesp commented Apr 18, 2019

This fixes the release/1.2 branch for CI, @containerd/containerd-maintainers

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3229 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3229   +/-   ##
============================================
  Coverage        43.74%   43.74%           
============================================
  Files              101      101           
  Lines            10743    10743           
============================================
  Hits              4700     4700           
  Misses            5311     5311           
  Partials           732      732
Flag Coverage Δ
#linux 47.38% <ø> (ø) ⬆️
#windows 40.85% <ø> (ø) ⬆️

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 894b81a...0b2d89c. Read the comment docs.

@crosbymichael crosbymichael merged commit 56a6552 into containerd:release/1.2 Apr 18, 2019
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.

5 participants