Skip to content

Fix missing vendor packages#3650

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-vendor-issue
Sep 13, 2019
Merged

Fix missing vendor packages#3650
crosbymichael merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-vendor-issue

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Sep 13, 2019

The switch to urfave/cli had a use of a /v2 API, which
go modules handles correctly but vndr ignores. Downgrade
urfave/cli for now until the switch to go modules. Add
missing dependencies, which vndr now sees.
Note that CI was not catching this issue, it seems that
some part of the build process was pulling in dependencies
even if they weren't in vendor, causing the build to work.
However the vendor check was not seeing it. The ARM build
didn't pull in other dependencies into the gopath, causing
those builds to break.

closes #3645

@crosbymichael was there something in that package required after v1.22.0?

The switch to urfave/cli had a use of a /v2 API, which
go modules handles correctly but vndr ignores. Downgrade
urfave/cli for now until the switch to go modules. Add
missing dependencies, which vndr now sees.
Note that CI was not catching this issue, it seems that
some part of the build process was pulling in dependencies
even if they weren't in vendor, causing the build to work.
However the vendor check was not seeing it. The ARM build
didn't pull in other dependencies into the gopath, causing
those builds to break.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan added this to the 1.3 milestone Sep 13, 2019
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 13, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3650   +/-   ##
=======================================
  Coverage   42.39%   42.39%           
=======================================
  Files         127      127           
  Lines       14048    14048           
=======================================
  Hits         5955     5955           
  Misses       7193     7193           
  Partials      900      900
Flag Coverage Δ
#linux 45.9% <ø> (ø) ⬆️
#windows 37.27% <ø> (ø) ⬆️

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 9741f03...5bb0281. Read the comment docs.

1 similar comment
@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3650   +/-   ##
=======================================
  Coverage   42.39%   42.39%           
=======================================
  Files         127      127           
  Lines       14048    14048           
=======================================
  Hits         5955     5955           
  Misses       7193     7193           
  Partials      900      900
Flag Coverage Δ
#linux 45.9% <ø> (ø) ⬆️
#windows 37.27% <ø> (ø) ⬆️

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 9741f03...5bb0281. Read the comment docs.

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

I checked out this PR's vendor changes with make genman and it is correctly producing manpages, so looks like this is OK for now (to go back to urfave/cli v1.22)

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 9339104 into containerd:master Sep 13, 2019
@dmcgowan dmcgowan deleted the fix-vendor-issue branch March 23, 2022 22:26
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.

ARM CI failed due to md2man package not found

5 participants