Skip to content

[release/1.0] Fix vendor validation#2102

Merged
stevvooe merged 4 commits intocontainerd:release/1.0from
dnephin:fix-vendor-validation
Feb 5, 2018
Merged

[release/1.0] Fix vendor validation#2102
stevvooe merged 4 commits intocontainerd:release/1.0from
dnephin:fix-vendor-validation

Conversation

@dnephin
Copy link
Copy Markdown
Contributor

@dnephin dnephin commented Feb 5, 2018

Backport of #2092

release/1.0 didn't have any vendor validation so I had to backport the change to install vndr as well.

@stevvooe
Copy link
Copy Markdown
Member

stevvooe commented Feb 5, 2018

release/1.0 didn't have any vendor validation so I had to backport the change to install vndr as well.

Shouldn't there be an extra commit for this?

@stevvooe
Copy link
Copy Markdown
Member

stevvooe commented Feb 5, 2018

Also, make sure to use git cherry-pick -x -s -S, per the cherry pick procedure.

@crosbymichael
Copy link
Copy Markdown
Member

Maybe c024da2dec19dd3a59ac16ee6e37ff4c7a3e291f also?

@dnephin
Copy link
Copy Markdown
Contributor Author

dnephin commented Feb 5, 2018

the dco check changes are a separate commit, but I can bring in c024da2 if you want me to pull that in as well. I think they can be in a separate PR though.

Signed-off-by: Daniel Nephin <[email protected]>
(cherry picked from commit cc9216c)
Signed-off-by: Daniel Nephin <[email protected]>
Signed-off-by: Daniel Nephin <[email protected]>
(cherry picked from commit 315084f)
Signed-off-by: Daniel Nephin <[email protected]>
@crosbymichael
Copy link
Copy Markdown
Member

Up to you. you can do it in one pr if there are more vendor changes you have to pick to get this fixed.

vendor/ must be removed first, otherwise files added to vendor/ that aren't added to
vendor.conf will not cause the validation to fail.

Signed-off-by: Daniel Nephin <[email protected]>
(cherry picked from commit 2125d8e)
Signed-off-by: Daniel Nephin <[email protected]>
@dnephin dnephin force-pushed the fix-vendor-validation branch from 47dd1d2 to 043828f Compare February 5, 2018 17:32
@dnephin
Copy link
Copy Markdown
Contributor Author

dnephin commented Feb 5, 2018

Ok, I think I've got the cherry-pick done correctly now. Adding the vendor check found an error with vendor, so fixed that as well. in the last commit.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2102 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2102   +/-   ##
============================================
  Coverage        50.57%   50.57%           
============================================
  Files               81       81           
  Lines             7167     7167           
============================================
  Hits              3625     3625           
  Misses            2848     2848           
  Partials           694      694
Flag Coverage Δ
#linux 50.57% <ø> (ø) ⬆️

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 04c223f...b9640ad. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe added this to the 1.0.2 milestone Feb 5, 2018
@stevvooe
Copy link
Copy Markdown
Member

stevvooe commented Feb 5, 2018

LGTM

I have added this to the 1.0.2 milestone, as I believe these are important changes for ensuring quality of the release (ie, vendored imports should match versions).

@stevvooe stevvooe merged commit 7193749 into containerd:release/1.0 Feb 5, 2018
@dnephin dnephin deleted the fix-vendor-validation branch February 5, 2018 19:47
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