Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update godeps and use by makefile #231

Merged

Conversation

Mashimiao
Copy link

update dependencies to the latest version
and add directory vendor as _workspace will be deprecated in go1.8

Signed-off-by: Ma Shimiao mashimiao.fnst@cn.fujitsu.com

@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch 2 times, most recently from dcb08e9 to 7975741 Compare October 7, 2016 07:36
@liangchenye
Copy link
Member

I'm fine to update this.
But I prefer to do it after most other PRs been merged.

@mrunalp
Copy link
Contributor

mrunalp commented Oct 11, 2016

Yeah, let's get the other ones in.

@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch 2 times, most recently from bc4a30a to 148ae00 Compare November 14, 2016 07:21
@Mashimiao
Copy link
Author

@opencontainers/runtime-tools-maintainers
Can we let this in first? I think there are many differences between spec v1.0.0-rc1 and v1.0.0-rc2.
The backward spec-go has affected usage. like mentioned in #268

.travis.yml Outdated
@@ -5,14 +5,15 @@ go:
sudo: false

before_install:
- go get github.com/tools/godep
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this addition? Does Travis start using godep somewhere?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

godep will be used in Makefile

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I'd missed that between all the Godeps removals and vendor additions.

@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch 2 times, most recently from 7ae267b to 1168ef5 Compare March 24, 2017 02:07
@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch 5 times, most recently from da8931f to 4c7392f Compare April 11, 2017 02:22
@Mashimiao
Copy link
Author

As #349 is landed, can we start to review this PR?
@liangchenye @mrunalp

@Mashimiao Mashimiao modified the milestone: 0.6 Apr 11, 2017
@Mashimiao
Copy link
Author

ping @liangchenye @mrunalp @hqhq

@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch from 4c7392f to a01adbc Compare July 4, 2017 05:34
@liangchenye
Copy link
Member

golint in make test will check all the files under vendor directory, so the CI fails.

Can you skip this in Makefile? @Mashimiao

@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch from a01adbc to 662d87e Compare July 4, 2017 06:35
@Mashimiao
Copy link
Author

@liangchenye yes, updated. I think there is no need to exit with output of golint

@liangchenye
Copy link
Member

liangchenye commented Jul 4, 2017

LGTM

Approved with PullApprove

@hqhq
Copy link
Contributor

hqhq commented Jul 4, 2017

@Mashimiao What tool are you using? Just godep or tools like vndr?

Why there's no config file for dependencies?

@Mashimiao
Copy link
Author

Just use godep. sorry for leave the config behind.
@liangchenye @hqhq PTAL

},
{
"ImportPath": "golang.org/x/sys/unix",
"Rev": "f3918c30c5c2cb527c0b071a27c35120a6c0719a"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need to add this in this PR?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

automatically added by godep, not sure if it should be here. But as unix also is called and depended by runtime-tools, I think may be it's OK

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find runc or image-tools also add them into vendor directory

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They use x/sys/unix to replace syscall package, maybe it's used by the updated vendors, it's fine if is automatically added.

@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch from 2dc42f7 to 89178d7 Compare July 4, 2017 08:13
@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch 2 times, most recently from eb6c0c7 to c7c0082 Compare July 4, 2017 08:36
Makefile Outdated

.govet:
go vet -x ./...
OUT=$$(go vet ./... | grep -v "exit status" | grep -v vendor); if test -n "$${OUT}"; then echo "$${OUT}" && exit 1; fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do something like:

packages = $(shell go list ./... | grep -v vendor)
.govet:
    go vet $(packages)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated, PTAL

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not exactly what I expected, but we can do that later.

Ma Shimiao added 4 commits July 4, 2017 17:12
remove test files in dependencies
add directory vendor as _workspace will be deprecated in go1.8

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
As _workspace is deprecated and support for it will be
removed when go1.8 is released.
I think RUNTIME_TOOLS_LINK will not be needed any more

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
@Mashimiao Mashimiao force-pushed the update-godeps-on-latest-version branch from c7c0082 to 7c5ce64 Compare July 4, 2017 09:27
@hqhq
Copy link
Contributor

hqhq commented Jul 4, 2017

LGTM

Approved with PullApprove

1 similar comment
@liangchenye
Copy link
Member

liangchenye commented Jul 4, 2017

LGTM

Approved with PullApprove

@liangchenye liangchenye merged commit b8f1cb9 into opencontainers:master Jul 4, 2017
hqhq added a commit to hqhq/runtime-tools that referenced this pull request Jul 5, 2017
We used to use this option but it's reverted
in opencontainers#231 , not sure about the reason, it's simpler
than to use the OUT hack.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
wking added a commit to wking/ocitools-v2 that referenced this pull request Jul 25, 2017
Generated with:

  $ godep save ./...
  $ git mv Godeps/_workspace/src/github.com/xeipuuv/ vendor/github.com/

I'm not sure why I need the 'git mv ...'.  We've been keeping our
vendored content there since aab108d (update godeps and use by
makefile, 2017-03-24, opencontainers#231), but my godep is still trying to save the
content under Godeps/_workspace.  Maybe it's because my system Go is
still 1.7.4?

Signed-off-by: W. Trevor King <wking@tremily.us>
@Mashimiao Mashimiao removed this from the v0.6.0 milestone Sep 15, 2017
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