diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4497a9b..b95cb3d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,5 +32,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + - name: Run lint + run: make lint - name: Run tests run: make test diff --git a/Makefile b/Makefile index 62c4399..95c2cbc 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,11 @@ VERSION ?= 0.0.1 SHELL = /usr/bin/env bash -o pipefail .SHELLFLAGS = -ec +## Location to install dependencies to +LOCALBIN ?= $(shell pwd)/bin +$(LOCALBIN): + mkdir -p $(LOCALBIN) + # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) GOBIN=$(shell go env GOPATH)/bin @@ -42,17 +47,12 @@ bootstrap: ## Installs necessary third party components ##@ Testing -test: lint ## Lints the project then runs all tests +test: ## Runs all tests go test -count=1 ./... clean: ## Runs go clean go clean -i -## Location to install dependencies to -LOCALBIN ?= $(shell pwd)/bin -$(LOCALBIN): - mkdir -p $(LOCALBIN) - GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint GOLANGCI_LINT_VERSION ?= v1.56.1 diff --git a/bin/golangci-lint b/bin/golangci-lint deleted file mode 100755 index afed9c5..0000000 Binary files a/bin/golangci-lint and /dev/null differ