Skip to content

Conversation

@SamWhited
Copy link
Contributor

@SamWhited SamWhited commented Sep 6, 2019

Please also consider adding a semver compatible tag such as v0.0.1, thank you for your consideration.

EDIT apologies for the re-vendor, I can remove that change but thought it would be useful to go ahead and have the vendor tree created by go mod vendor. In general I would say it's best not to vendor in libraries and to rely on the binaries that depend on this library to vendor if they need it, but not knowing much about this project I wanted to keep the changes small (scope wise, obviously it's a lot of files still).

EDIT: CI will depend on containerd/project#25

@kzys
Copy link
Member

kzys commented Nov 21, 2019

containerd/project#25 has been merged!

So we need to remove vendor.conf in this PR to actually switch from vndr to Go modules, since the existence of the configuration files changes the behavior of script/validate/vendor.

@SamWhited
Copy link
Contributor Author

SamWhited commented Nov 22, 2019

@kzys vendor.conf is removed by this PR.

I didn't think about this before, but this repo is tested against multiple versions of Go. While this is great, sadly the Go team can't stop breaking vendoring and changes to the go.mod file in every version of Go, so Go 1.11, 1.12, and 1.13 may all result in different go.mod files or vendor trees. How would you like to proceed?

EDIT: for now I've tried creating a separate validation stage in CI with a fixed version of Go. Hopefully that works.

@kzys
Copy link
Member

kzys commented Nov 22, 2019

Oh, I thought it was still there. Thanks.

Regarding the remaining failures, you would need to have env GO111MODULE=off before go get, like containerd/go-cni#50.

Signed-off-by: Sam Whited <sam@samwhited.com>
@SamWhited
Copy link
Contributor Author

Ah yes, I forgot that Go 1.11 didn't have the behavior where it does different things depending on whether it finds a go.mod file or not. That should fix it. I left the pushd/popd in since they'll keep it working even if GO111MODULE is removed in a future version of Go.

Copy link
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

@SamWhited
Copy link
Contributor Author

Fixed conflict. Gentle ping.

@AkihiroSuda AkihiroSuda merged commit 1097c8b into containerd:master Dec 14, 2019
@SamWhited SamWhited deleted the modules branch December 15, 2019 13:48
thaJeztah added a commit to thaJeztah/buildkit that referenced this pull request Jan 13, 2020
…ce1fc84c4c4

full diff: containerd/continuity@75bee3e...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/buildkit that referenced this pull request Jan 13, 2020
…ce1fc84c4c4

full diff: containerd/continuity@75bee3e...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Jan 13, 2020
…ce1fc84c4c4

full diff: containerd/continuity@f2a389a...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 13, 2020
…ce1fc84c4c4

full diff: containerd/continuity@f2a389a...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 67a0695e8b355c7a1c3382b7165f97a2bafc5f9b
Component: engine
thaJeztah added a commit to thaJeztah/buildkit that referenced this pull request Jan 16, 2020
…ce1fc84c4c4

full diff: containerd/continuity@75bee3e...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e0ac634)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Feb 12, 2020
…ce1fc84c4c4

full diff: containerd/continuity@f2a389a...26c1120

full diff: containerd/continuity@f2a389a...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Feb 12, 2020
…ce1fc84c4c4

full diff: containerd/continuity@f2a389a...26c1120

full diff: containerd/continuity@f2a389a...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Feb 13, 2020
…ce1fc84c4c4

full diff: containerd/continuity@f2a389a...26c1120

full diff: containerd/continuity@f2a389a...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 507e6b61cf82059ce412ccdb531b0e9402d2d2a8
Component: cli
eiffel-fl pushed a commit to eiffel-fl/cli that referenced this pull request Jul 28, 2020
…ce1fc84c4c4

full diff: containerd/continuity@f2a389a...26c1120

full diff: containerd/continuity@f2a389a...26c1120

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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