From caad408929dcc4b3ba87092335ffb6d8eb7a2479 Mon Sep 17 00:00:00 2001 From: Oliver Steele Date: Wed, 12 Jul 2017 20:01:17 -0400 Subject: [PATCH] make install_dev_tools -> setup --- .travis.yml | 2 +- CONTRIBUTING.md | 2 +- Makefile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f3a28c..60fedba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - go get github.com/mattn/goveralls install: - - make install_dev_tools + - make setup - go get -t ./... - pip install --user Pygments - export PATH=$HOME/.local/bin:$PATH diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8e1a0c8..b17a1dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ Fork and clone the repo. Install package dependencies and development tools: ```bash -make install_dev_tools +make setup go get -t ./... ``` diff --git a/Makefile b/Makefile index 963f04b..d6d451e 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ COMMIT_HASH = `git rev-parse --short HEAD 2>/dev/null` LDFLAGS=-ldflags "-X ${PACKAGE}.Version=${COMMIT_HASH}" -.DEFAULT_GOAL: $(BINARY) -.PHONY: build clean dependencies setup install lint test help +.DEFAULT_GOAL: build +.PHONY: build clean deps setup install lint test help $(BINARY): $(SOURCES) go build ${LDFLAGS} -o ${BINARY} ${PACKAGE}/cmd/gojekyll @@ -21,14 +21,14 @@ clean: ## remove binary files deps: ## list dependencies go list -f '{{join .Imports "\n"}}' ./... | grep -v ${PACKAGE} | grep '\.' | sort | uniq -install_dev_tools: ## install dependencies and development tools +setup: ## install dependencies and development tools go get -u github.com/alecthomas/gometalinter gometalinter --install install: ## compile and install the executable go install ${LDFLAGS} ${PACKAGE}/cmd/gojekyll -lint: ## lint the package +lint: ## Run all the linters gometalinter ./... --disable=gotype test: ## test the package