Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2022-04-26 01:50:44 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2022-04-28 20:54:34 +0300
commit65d0d02887b86661590e74f560cbda0d517b95c2 (patch)
tree8d488912aa3bb60a158cc71bbe0ba5e826cabd02 /Makefile.util.mk
parent57de8e72fe96a0773b8f9ef95cf77300a90a66f0 (diff)
Replace make setup with go run and version suffixes
Changelog: other
Diffstat (limited to 'Makefile.util.mk')
-rw-r--r--Makefile.util.mk22
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.util.mk b/Makefile.util.mk
index 82eafd3b..0dee14d4 100644
--- a/Makefile.util.mk
+++ b/Makefile.util.mk
@@ -3,23 +3,25 @@
OUT_FORMAT ?= colored-line-number
LINT_FLAGS ?= $(if $V,-v)
REPORT_FILE ?=
+GOLANGCI_VERSION=v1.44.0
+GOTESTSUM_VERSION=v1.7.0
COVERAGE_PACKAGES=$(shell (go list ./... | grep -v -e "test/acceptance" | tr "\n", "," | sed 's/\(.*\),/\1 /'))
-lint: .GOPATH/.ok bin/golangci-lint
- $Q ./bin/golangci-lint run ./... --out-format $(OUT_FORMAT) $(LINT_FLAGS) | tee ${REPORT_FILE}
+lint: .GOPATH/.ok
+ $Q go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_VERSION) run ./... --out-format $(OUT_FORMAT) $(LINT_FLAGS) | tee ${REPORT_FILE}
-format: .GOPATH/.ok bin/golangci-lint
- $Q ./bin/golangci-lint run ./... --fix --out-format $(OUT_FORMAT) $(LINT_FLAGS) | tee ${REPORT_FILE}
+format: .GOPATH/.ok
+ $Q go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_VERSION) run ./... --fix --out-format $(OUT_FORMAT) $(LINT_FLAGS) | tee ${REPORT_FILE}
-test: .GOPATH/.ok bin/gotestsum gitlab-pages
+test: .GOPATH/.ok gitlab-pages
rm -f tests.out
- ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- ./... ${ARGS}
+ go run gotest.tools/gotestsum@$(GOTESTSUM_VERSION) --junitfile junit-test-report.xml --format testname -- ./... ${ARGS}
-race: .GOPATH/.ok bin/gotestsum gitlab-pages
- ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- -race $(if $V,-v) ./... ${ARGS}
+race: .GOPATH/.ok gitlab-pages
+ go run gotest.tools/gotestsum@$(GOTESTSUM_VERSION) --junitfile junit-test-report.xml --format testname -- -race $(if $V,-v) ./... ${ARGS}
-acceptance: .GOPATH/.ok bin/gotestsum gitlab-pages
- ./bin/gotestsum --junitfile junit-test-report.xml --format testname -- $(if $V,-v) ./test/acceptance ${ARGS}
+acceptance: .GOPATH/.ok gitlab-pages
+ go run gotest.tools/gotestsum@$(GOTESTSUM_VERSION) --junitfile junit-test-report.xml --format testname -- $(if $V,-v) ./test/acceptance ${ARGS}
bench: .GOPATH/.ok gitlab-pages
go test -bench=. -run=^$$ ./...