diff --git a/.travis.yml b/.travis.yml index 7beb1ade3c3..fdc65f25867 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,19 @@ language: go go: - 1.11.x - 1.12.x + - 1.13.x - tip matrix: include: - - go: 1.12.x + - go: 1.13.x env: - RUNC_USE_SYSTEMD=1 script: - make BUILDTAGS="${BUILDTAGS}" all - sudo PATH="$PATH" make localintegration RUNC_USE_SYSTEMD=1 + # Due to different vendor behavior in go 1.13 vs pre go 1.13, we only validate deps against 1.13 + - make verify-dependencies - go: 1.12.x env: - VIRTUALBOX_VERSION=6.0 diff --git a/Makefile b/Makefile index f9a17eb8f5d..f224b6ec742 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ clean: rm -rf $(RELEASE_DIR) rm -rf $(MAN_DIR) -validate: verify-dependencies +validate: script/validate-gofmt script/validate-c $(GO) vet $(allpackages) diff --git a/README.md b/README.md index a151916afeb..856390855d3 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,14 @@ You can run a test using your container engine's flags by setting `CONTAINER_ENG `runc` uses [Go Modules](https://github.com/golang/go/wiki/Modules) for dependencies management. Please refer to [Go Modules](https://github.com/golang/go/wiki/Modules) for how to add or update -new dependencies. +new dependencies. When updating dependencies, be sure that you are running Go `1.13` or newer. + +``` +# Update vendored dependencies +make vendor +# Verify all dependencies +make verify-dependencies +``` ## Using runc diff --git a/vendor/modules.txt b/vendor/modules.txt index 8f8b1973a88..1a2541ff4e7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,67 +1,45 @@ # github.com/checkpoint-restore/go-criu v0.0.0-20181120144056-17b0214f6c48 -## explicit github.com/checkpoint-restore/go-criu/rpc # github.com/cilium/ebpf v0.0.0-20191025125908-95b36a581eed -## explicit github.com/cilium/ebpf github.com/cilium/ebpf/asm github.com/cilium/ebpf/internal github.com/cilium/ebpf/internal/unix # github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 -## explicit github.com/containerd/console # github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e -## explicit github.com/coreos/go-systemd/activation github.com/coreos/go-systemd/dbus # github.com/cyphar/filepath-securejoin v0.2.2 -## explicit github.com/cyphar/filepath-securejoin # github.com/docker/go-units v0.3.3 -## explicit github.com/docker/go-units # github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f -## explicit github.com/godbus/dbus # github.com/golang/protobuf v1.0.0 -## explicit github.com/golang/protobuf/proto # github.com/konsorten/go-windows-terminal-sequences v1.0.1 github.com/konsorten/go-windows-terminal-sequences # github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 -## explicit github.com/mrunalp/fileutils # github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559 -## explicit github.com/opencontainers/runtime-spec/specs-go # github.com/opencontainers/selinux v1.3.3 -## explicit github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label # github.com/pkg/errors v0.8.1 -## explicit github.com/pkg/errors # github.com/seccomp/libseccomp-golang v0.9.1 -## explicit github.com/seccomp/libseccomp-golang # github.com/sirupsen/logrus v1.4.1 -## explicit github.com/sirupsen/logrus # github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 -## explicit github.com/syndtr/gocapability/capability # github.com/urfave/cli v1.20.0 -## explicit github.com/urfave/cli # github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc -## explicit github.com/vishvananda/netlink github.com/vishvananda/netlink/nl -# github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df -## explicit -# golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e -## explicit # golang.org/x/sys v0.0.0-20191115151921-52ab43148777 -## explicit golang.org/x/sys/unix golang.org/x/sys/windows