Skip to content

Commit

Permalink
grafana#903: added vet flag to resolve race issue
Browse files Browse the repository at this point in the history
  • Loading branch information
vanshaj committed Jul 11, 2022
1 parent bfa415c commit bf4015d
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
GOLANGCI_LINT_VERSION = $(shell head -n 1 .golangci.yml | tr -d '\# ')
TMPDIR ?= /tmp

all: build

build :
go build

format :
find . -name '*.go' -exec gofmt -s -w {} +

ci-like-lint :
@docker run --rm -t -v $(shell pwd):/app \
-v $(TMPDIR)/golangci-cache-$(GOLANGCI_LINT_VERSION):/golangci-cache \
--env "GOLANGCI_LINT_CACHE=/golangci-cache" \
-w /app golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) \
make lint

lint :
golangci-lint run --out-format=tab --new-from-rev master ./...

tests :
go test -race -timeout 210s ./...

check : ci-like-lint tests

container:
docker build --rm --pull --no-cache -t grafana/k6 .

.PHONY: build format ci-like-lint lint tests check container
GOLANGCI_LINT_VERSION = $(shell head -n 1 .golangci.yml | tr -d '\# ')
TMPDIR ?= /tmp

all: build

build :
go build

format :
find . -name '*.go' -exec gofmt -s -w {} +

ci-like-lint :
@docker run --rm -t -v $(shell pwd):/app \
-v $(TMPDIR)/golangci-cache-$(GOLANGCI_LINT_VERSION):/golangci-cache \
--env "GOLANGCI_LINT_CACHE=/golangci-cache" \
-w /app golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) \
make lint

lint :
golangci-lint run --out-format=tab --new-from-rev master ./...

tests :
go test -race -timeout 210s ./... -vet=off

check : ci-like-lint tests

container:
docker build --rm --pull --no-cache -t grafana/k6 .

.PHONY: build format ci-like-lint lint tests check container

0 comments on commit bf4015d

Please sign in to comment.