Enforce test, vet, lint, and fmt in make

* Replace test and git-version script with commands
poseidon · Feb 6, 2019 · df3ac83 · df3ac83
1 parent 193f137
commit df3ac83
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 49 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.9
+  - "1.9.x"
   - "1.10.x"
   - "1.11.x"
 install:

diff --git a/Makefile b/Makefile
@@ -2,11 +2,10 @@ export CGO_ENABLED:=0
 export GO111MODULE=on
 export GOFLAGS=-mod=vendor
 
-VERSION=$(shell ./scripts/git-version)
-GOPATH_BIN:=$(shell echo ${GOPATH} | awk 'BEGIN { FS = ":" }; { print $1 }')/bin
+VERSION=$(shell git describe --tags --match=v* --always --dirty)
 
 .PHONY: all
-all: bin/terraform-provider-matchbox
+all: build test vet lint fmt
 
 .PHONY: build
 bin/terraform-provider-matchbox:
@@ -18,7 +17,19 @@ install: bin/terraform-provider-matchbox
 
 .PHONY: test
 test:
-	@./scripts/test
+	@go test ./... -cover
+
+.PHONY: vet
+vet:
+	@go vet -all ./...
+
+.PHONY: lint
+lint:
+	@golint -set_exit_status `go list ./...`
+
+.PHONY: fmt
+fmt:
+	@test -z $$(go fmt ./...)
 
 .PHONY: update
 update:

diff --git a/scripts/git-version b/scripts/git-version
diff --git a/scripts/test b/scripts/test