From 21a02fb559158c7de5019c252132f36e8b896dc0 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 18 Jul 2019 17:42:12 +0530 Subject: [PATCH] Add dep check to the Makefile check vendor directory is out of sync with Gopkh .lock and .toml file Signed-off-by: Madhu Rajanna --- .travis.yml | 6 +++--- Makefile | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1dc437760..6d6b65c21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,9 +43,9 @@ jobs: "https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh" | bash -s -- -b $GOPATH/bin "${GOLANGCI_VERSION}" script: - - scripts/lint-text.sh --require-all - - scripts/lint-go.sh - - scripts/test-go.sh + - make static-check + - make go-test + - make dep-check || travis_terminate 1; - name: cephcsi with kube 1.13.7 script: diff --git a/Makefile b/Makefile index 955286386..b0e0a900a 100644 --- a/Makefile +++ b/Makefile @@ -33,14 +33,17 @@ LDFLAGS += -X $(GO_PROJECT)/pkg/util.DriverVersion=$(CSI_IMAGE_VERSION) all: cephcsi -test: go-test static-check +test: go-test static-check dep-check go-test: ./scripts/test-go.sh +dep-check: + dep check + static-check: ./scripts/lint-go.sh - ./scripts/lint-text.sh + ./scripts/lint-text.sh --require-all func-test: go test github.com/ceph/ceph-csi/e2e $(TESTOPTIONS)