Fix travis

Signed-off-by: Ondrej Fabry <[email protected]>

Author: ondrej-fabry

.travis.yml

@@ -4,8 +4,11 @@ language: go
 
 go_import_path: github.com/contiv/vpp
 
+git:
+  depth: 1
+
 go:
-  - 1.9.x
+  - 1.10.x
 
 cache:
   directories:
@@ -15,13 +18,14 @@ env:
   - GO_BUILD_TAGS=mockvpp
 
 before_install:
-  - go get -v github.com/golang/lint/golint
-  - go get github.com/mattn/goveralls
-  - sudo apt-get install npm && npm install -g markdown-link-check
+  - make get-linkcheck
+  - make get-linters
+  - make get-covtools
+  - go get -v github.com/mattn/goveralls
 
 script:
-  - make check_links || true
-  - make check_format
+  - make check-links || true
+  - make check-format
   - make lint
   - make
   - make test-cover

Gopkg.lock

@@ -33,20 +33,29 @@ required = [
     "github.com/google/cadvisor",
     "k8s.io/apiserver/pkg/apis/apiserver",
     "github.com/ugorji/go/codec",
-    "github.com/docker/distribution"
+    "github.com/docker/distribution",
+    "github.com/gogo/protobuf/protoc-gen-gogo"
 ]
 
 [[constraint]]
-  revision = "0456d22f67865977065886ed58778621b21b7ede"
+  name = "github.com/ligato/vpp-agent"
+  revision = "4db11634e69208566fd09839f17077f28fa19ce4"
+
+[[constraint]]
+  name = "github.com/ligato/cn-infra"
+  revision = "e5bff3cae460e0e45770b9840ddf863da8540d72"
+
+[[constraint]]
   name = "git.fd.io/govpp.git"
+  revision = "0456d22f67865977065886ed58778621b21b7ede"
 
 [[constraint]]
-  revision = "b5bfa59ec0adc420475f97f89b58045c721d761c"
   name = "github.com/wadey/gocovmerge"
+  revision = "b5bfa59ec0adc420475f97f89b58045c721d761c"
 
 [[constraint]]
-  revision = "1c81e2a794c6e26a4c650142ae8893c47f619764"
   name = "github.com/opencontainers/runc"
+  revision = "1c81e2a794c6e26a4c650142ae8893c47f619764"
 
 [[constraint]]
   name = "k8s.io/apiserver"
@@ -60,10 +69,6 @@ required = [
   name = "github.com/docker/distribution"
   revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
-[[constraint]]
-  name = "github.com/ligato/cn-infra"
-  revision = "e5bff3cae460e0e45770b9840ddf863da8540d72"
-
 [[constraint]]
   name = "github.com/containernetworking/cni"
   version = "0.6.0"
@@ -73,8 +78,8 @@ required = [
   version = "0.5.0"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/golang/glog"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/docker/docker"
@@ -93,17 +98,13 @@ required = [
   name = "github.com/golang/protobuf"
   branch = "master"
 
-[[constraint]]
-  name = "github.com/ligato/vpp-agent"
-  revision = "4db11634e69208566fd09839f17077f28fa19ce4"
-
 [[constraint]]
   name = "github.com/prometheus/client_golang"
   version = "0.8.0"
 
 [[constraint]]
-  branch = "master"
   name = "golang.org/x/net"
+  branch = "master"
 
 [[constraint]]
   name = "google.golang.org/grpc"

Gopkg.toml

@@ -162,8 +162,7 @@ test-cover-xml: test-cover
 
 # Get generator tools
 get-generators:
-	$(if $(shell command -v protoc --gogo_out=. 2> /dev/null),$(info # gogo/protobuf is already installed),$(error gogo/protobuf missing, please install it with go get github.com/gogo/protobuf))
-	go get -v github.com/golang/protobuf/protoc-gen-go
+	go install -v ./vendor/github.com/gogo/protobuf/protoc-gen-gogo
 
 # Generate sources
 generate: get-generators
@@ -173,6 +172,11 @@ generate: get-generators
 	cd plugins/ksr && go generate
 	cd cmd/contiv-stn && go generate
 
+# Get linter tools
+get-linters:
+	@echo " => installing linters"
+	go get -v github.com/golang/lint/golint
+
 # Run code analysis
 lint:
 	@echo "# running code analysis"
@@ -199,8 +203,8 @@ LINKCHECK := $(shell command -v markdown-link-check 2> /dev/null)
 # Get link check tool
 get-linkcheck:
 ifndef LINKCHECK
-	sudo apt-get install npm
-	sudo npm install -g markdown-link-check
+	sudo apt-get update && sudo apt-get install npm
+	npm install -g markdown-link-check
 endif
 
 # Validate links in markdown files
@@ -215,11 +219,16 @@ ifndef DEP
 	go get -v github.com/golang/dep/cmd/dep
 endif
 
-# Install project's dependencies
+# Install Go dependencies
 dep-install: get-dep
-	@echo "# installing project's dependencies"
+	@echo "# installing Go dependencies"
 	$(DEP) ensure -v
 
+# Update Go dependencies
+dep-update: get-dep
+	@echo "# updating Go dependencies"
+	$(DEP) ensure -v -update
+
 describe:
 	./scripts/contiv_describe.sh
 
@@ -233,7 +242,7 @@ helm-package:
 	install clean test test-race \
 	get-covtools test-cover test-cover-html test-cover-xml \
 	get-generators generate \
-	lint metalinter format check-format \
+	get-linters lint metalinter format check-format \
 	get-linkcheck check-links \
 	get-dep dep-install \
 	describe generate-manifest helm-package