Improvements to makefile

Signed-off-by: Brian Goff <[email protected]>
(cherry picked from commit 6a4f8f3)
Signed-off-by: Brian Goff <[email protected]>

Author: cpuguy83

.gitignore

@@ -1 +1,2 @@
 go-md2man
+bin

.travis.yml

@@ -12,8 +12,7 @@ matrix:
     - go: tip
 
 script:
-  - if [ "${TRAVIS_GO_VERSION}" = "stable" ]; then script/setup/dev-tools; fi
-  - go build -i .
+  - if [ "${TRAVIS_GO_VERSION}" = "stable" ]; then make golangci-lint
   - if [ "${TRAVIS_GO_VERSION}" = "stable" ]; then echo running check scripts; make check; fi
-  - go build
-  - go test -v ./...
+  - make build
+  - make TEST_FLAGS="-v" test

Makefile

@@ -1,3 +1,33 @@
+LINTER_BIN ?= golangci-lint
+
+.PHONY:
+build: bin/go-md2man
+
+.PHONY: clean
+clean:
+	@rm -rf bin/*
+
 .PHONY: check
-check:
-	golangci-lint run
+check: lint
+
+.PHONY: test
+test:
+	@go test $(TEST_FLAGS) ./...
+
+.PHONY: lint
+lint:
+	@$(LINTER_BIN) run --new-from-rev "HEAD~$(git rev-list master.. --count)" ./...
+
+bin/go-md2man: actual_build_flags := $(BUILD_FLAGS) -o bin/go-md2man
+bin/go-md2man: bin
+	@CGO_ENABLED=0 go build $(actual_build_flags)
+
+bin:
+	@mkdir ./bin
+
+$(LINTER_BIN): linter_bin_path := $(shell which $(LINTER_BIN))
+$(LINTER_BIN):
+	@if [ -z $(linter_bin_path) ] || [ ! -x $(linter_bin_path) ]; then \
+		curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.15.0; \
+	fi
+

hack/ci/check_mods.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+exit_code=0
+
+make mod
+git diff --exit-code go.mod go.sum || exit_code=$?
+
+if [ ${exit_code} -eq 0 ]; then
+	exit 0
+fi
+
+echo "please run \`make mod\` and check in the changes"
+exit ${exit_code}

script/setup/dev-tools

@@ -2,6 +2,4 @@
 
 set -eu -o pipefail
 
-curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
-
 go get -u github.com/golang/dep/cmd/dep