Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

vendor: Add missing package dependencies #54

Merged
merged 3 commits into from
Feb 23, 2018

Conversation

jodh-intel
Copy link
Contributor

Update the vendoring to include missing packages the proxy relies on.

Fixes #53.

Signed-off-by: James O. D. Hunt james.o.hunt@intel.com

Update the vendoring to include missing packages the proxy relies on.

Fixes kata-containers#53.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
@jodh-intel
Copy link
Contributor Author

Hi @sboeuf - could you take a look?

@grahamwhaley
Copy link
Contributor

Q. - we don't seem to have the dep [prune] section here in the toml file - is now maybe the time to add it?

@sboeuf
Copy link

sboeuf commented Feb 20, 2018

@jodh-intel I agree with @grahamwhaley that you should also update the Gopkg.toml the same way we did for other repos, so that it take into account the new [prune] tag.

@sboeuf sboeuf closed this Feb 20, 2018
@sboeuf sboeuf reopened this Feb 20, 2018
@sboeuf sboeuf added review and removed review labels Feb 20, 2018
@sboeuf
Copy link

sboeuf commented Feb 20, 2018

Sorry I hit the wrong button....

Update the `dep` config file to automatically prune when `dep ensure`
is run from now on.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
@jodh-intel
Copy link
Contributor Author

Good call. dep claims to auto-prune by default now, but it doesn't (yet).

I've updated the dep config on the newest commit as that was the cleanest way to do it: if I added the options before fixing the vendoring the diff was very confusing as some new files were pulled in and other were deleted (due to the new more aggressive pruning).

Fix a couple of issues identified by the CI calling `staticcheck`.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
@jodh-intel
Copy link
Contributor Author

I managed to unbreak it! 😄

Presumably, some of these issues are the result of our CI changing over time.

@sboeuf
Copy link

sboeuf commented Feb 20, 2018

@jodh-intel cool thx !
LGTM

Approved with PullApprove

@jodh-intel
Copy link
Contributor Author

ping @bergwolf, @laijs - could you take a look at this please? Until this lands, all PR CI builds will fail.

@WeiZhang555
Copy link
Member

WeiZhang555 commented Feb 23, 2018

Great to see GO test files pruned from vendor 😄

LGTM

Approved with PullApprove

@grahamwhaley
Copy link
Contributor

We are getting this on the CI:

.ci/jenkins_job_build.sh: line 66: .ci/setup.sh: No such file or directory

is that just an artifact of some PR merge race maybe - something to fix, or ignore and merge??

@jodh-intel
Copy link
Contributor Author

That error is coming from the tests repo and is unrelated to the changes on this PR afaics.

@chavafg - could you investigate?

@laijs
Copy link
Contributor

laijs commented Feb 23, 2018

LGTM

Approved with PullApprove

@laijs laijs merged commit 22fc022 into kata-containers:master Feb 23, 2018
@amshinde amshinde removed the review label Feb 23, 2018
@chavafg
Copy link
Contributor

chavafg commented Feb 23, 2018

@grahamwhaley, @jodh-intel the CI failed because #56 is still not merged.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants