From 75705d26d1ae5897c834274172f4bb8bf2ed1912 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 3 Apr 2017 14:22:07 -0700 Subject: [PATCH] Add DCO check to travis Signed-off-by: Michael Crosby --- .travis.yml | 2 ++ Makefile | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2f91b8..09a432c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,13 @@ install: - wget https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip -O /tmp/protoc-3.1.0-linux-x86_64.zip - unzip -o -d /tmp/protobuf /tmp/protoc-3.1.0-linux-x86_64.zip - export PATH=$PATH:/tmp/protobuf/bin/ + - go get -u github.com/vbatts/git-validation script: - make fmt - make binaries - make coverage + - TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" make dco - sudo PATH=$PATH GOPATH=$GOPATH make root-coverage after_success: diff --git a/Makefile b/Makefile index db1eade..3fad2e9 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ GO_LDFLAGS=-ldflags "-X $(PKG).Version=$(VERSION) -X $(PKG).Package=$(PKG)" # Flags passed to `go test` TESTFLAGS ?=-parallel 8 -race -.PHONY: clean all AUTHORS fmt vet lint build binaries test integration setup generate protos checkprotos coverage ci check help install uninstall vendor +.PHONY: clean all AUTHORS fmt vet lint dco build binaries test integration setup generate protos checkprotos coverage ci check help install uninstall vendor .DEFAULT: default all: binaries @@ -77,6 +77,14 @@ lint: ## run go lint @echo "🐳 $@" @test -z "$$(golint ./... | grep -v vendor/ | grep -v ".pb.go:" | tee /dev/stderr)" +dco: ## dco check + @which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found" && false) +ifdef TRAVIS_COMMIT_RANGE + git-validation -q -run DCO,short-subject,dangling-whitespace +else + git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD +endif + ineffassign: ## run ineffassign @echo "🐳 $@" @test -z "$$(ineffassign . | grep -v vendor/ | grep -v ".pb.go:" | tee /dev/stderr)"