From 777f97d8dee5542168c9c282e37f13b7a1d2da2e Mon Sep 17 00:00:00 2001 From: Odin Ugedal Date: Wed, 13 Nov 2019 15:05:47 +0100 Subject: [PATCH] Run verify-dependencies only on go1.x Signed-off-by: Odin Ugedal --- .travis.yml | 4 ++++ Makefile | 2 +- README.md | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1112d37a..0a540ded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,10 @@ go: matrix: include: + - go: 1.x + name: "verify-dependencies" + script: + - make verify-dependencies - go: 1.12.x name: "cgroup-systemd" env: diff --git a/Makefile b/Makefile index f9a17eb8..f224b6ec 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 a151916a..52e641ba 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.14` or newer. + +``` +# Update vendored dependencies +make vendor +# Verify all dependencies +make verify-dependencies +``` ## Using runc