Skip to content

fix RUNC.md vs vendor.conf mismatch#2337

Merged
estesp merged 1 commit intocontainerd:masterfrom
AkihiroSuda:fix-vendorconf-runcmd-mismatch
May 11, 2018
Merged

fix RUNC.md vs vendor.conf mismatch#2337
estesp merged 1 commit intocontainerd:masterfrom
AkihiroSuda:fix-vendorconf-runcmd-mismatch

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented May 11, 2018 •
edited
Loading

Actually we have been testing containerd with the runc version that is defined
in vendor.conf rather than the one defined in RUNC.md. (script/setup/install-runc, #1957 (comment)).

This commit makes sure that the revision defined in vendor.conf is always the desired one.

Signed-off-by: Akihiro Suda [email protected]

@AkihiroSuda
fix RUNC.md vs vendor.conf mismatch
b1e202c 
Actually we have been testing containerd with the runc version that is defined
in vendor.conf rather than the one defined in RUNC.md. (`script/setup/install-runc`).

This commit makes sure that the revision defined in vendor.conf is always the desired one.

Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda AkihiroSuda mentioned this pull request May 11, 2018
Merged
@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented May 11, 2018 •
edited
Loading

I suppose there is no downstream project that parses the RUNC_COMMIT line of RUNC.md. https://github.com/search?q=containerd+%22RUNC.md%22+%22RUNC_COMMIT%22&type=Code

If any project appears to depend on such parsing, I'll just copy-paste the correct commit revision to RUNC.md, and add a validation script so as to make sure RUNC.md is always synced with vendor.conf.

@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented May 11, 2018

appveyor failure is unrelated

codecov not installed. An error occurred during installation:
 The remote server returned an error: (500) Internal Server Error. Internal Server Error

@AkihiroSuda AkihiroSuda mentioned this pull request May 11, 2018
Merged
@codecov-io
Copy link
Copy Markdown

codecov-io commented May 11, 2018

Codecov Report

Merging #2337 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2337   +/-   ##
=======================================
  Coverage   44.98%   44.98%           
=======================================
  Files          92       92           
  Lines        9340     9340           
=======================================
  Hits         4202     4202           
  Misses       4459     4459           
  Partials      679      679
Flag Coverage Δ
#linux 49.28% <ø> (ø) ⬆️
#windows 41.24% <ø> (ø) ⬆️

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 a15e7a0...b1e202c. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented May 11, 2018

LGTM

estesp
estesp approved these changes May 11, 2018
View reviewed changes
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

@estesp estesp merged commit fcc66f5 into containerd:master May 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@AkihiroSuda @codecov-io @crosbymichael @estesp