aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Hanley <felix@userspace.com.au>2019-10-29 11:20:16 +0000
committerFelix Hanley <felix@userspace.com.au>2019-10-29 11:20:16 +0000
commit794369aa072d877cae9db28de74bdf94b00ca9e4 (patch)
tree1f4a7f2393de45989975df1d5e783f285d149765
parent9cc6bc35d7f22560a70d6f2c980a19fb401564a3 (diff)
parent6c94ce6994b781070765afd872773b86de311fc5 (diff)
downloadlexer-0.1.0.tar.gz
lexer-0.1.0.tar.bz2
Merge branch 'master' of src.userspace.com.au:lexerv0.1.0
-rw-r--r--.travis.yml8
-rw-r--r--Makefile16
2 files changed, 5 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6dba4a3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: go
-go:
- - "1.x"
- - master
-script:
- - go test -race -coverprofile=coverage.txt -covermode=atomic
-after_success:
- - bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
index f2a809d..8243281 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,18 @@
-GOPATH ?= $(HOME)/go
-pkgs := $(shell go list ./...)
-
.PHONY: test
test: lint ## Run tests with coverage
- go test -short -cover -coverprofile coverage.txt $(pkgs)
+ go test -short -cover -coverprofile coverage.txt ./...
go tool cover -html=coverage.txt -o coverage.html
.PHONY: lint
-lint: $(GOPATH)/bin/golint ## Run the code linter
- @golint $(pkgs)
-
-$(GOPATH)/bin/golint:
- go get -u golang.org/x/lint/golint
+lint: ## Run the code linter
+ revive ./...
.PHONY: clean
clean: ## Clean all test files
- @rm -rf coverage*
+ rm -rf coverage*
.PHONY: help
help:
- @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) |sort \
+ grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) |sort \
|awk 'BEGIN{FS=":.*?## "};{printf "\033[36m%-30s\033[0m %s\n",$$1,$$2}'