Run verify-dependencies only on go1.x

Signed-off-by: Odin Ugedal <odin@ugedal.com>
opencontainers · Mar 7, 2020 · 777f97d · 777f97d
1 parent 83f9b88
commit 777f97d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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