|
|
@ -49,7 +49,7 @@ endif
|
|
|
|
GOTEST := $(GO) test
|
|
|
|
GOTEST := $(GO) test
|
|
|
|
GOTEST_DIR :=
|
|
|
|
GOTEST_DIR :=
|
|
|
|
ifneq ($(CIRCLE_JOB),)
|
|
|
|
ifneq ($(CIRCLE_JOB),)
|
|
|
|
ifneq ($(shell command -v gotestsum > /dev/null),)
|
|
|
|
ifneq ($(shell command -v gotestsum 2> /dev/null),)
|
|
|
|
GOTEST_DIR := test-results
|
|
|
|
GOTEST_DIR := test-results
|
|
|
|
GOTEST := gotestsum --junitfile $(GOTEST_DIR)/unit-tests.xml --
|
|
|
|
GOTEST := gotestsum --junitfile $(GOTEST_DIR)/unit-tests.xml --
|
|
|
|
endif
|
|
|
|
endif
|
|
|
@ -61,7 +61,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
|
|
|
|
SKIP_GOLANGCI_LINT :=
|
|
|
|
SKIP_GOLANGCI_LINT :=
|
|
|
|
GOLANGCI_LINT :=
|
|
|
|
GOLANGCI_LINT :=
|
|
|
|
GOLANGCI_LINT_OPTS ?=
|
|
|
|
GOLANGCI_LINT_OPTS ?=
|
|
|
|
GOLANGCI_LINT_VERSION ?= v1.55.2
|
|
|
|
GOLANGCI_LINT_VERSION ?= v1.56.2
|
|
|
|
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
|
|
|
|
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
|
|
|
|
# windows isn't included here because of the path separator being different.
|
|
|
|
# windows isn't included here because of the path separator being different.
|
|
|
|
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
|
|
|
|
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
|
|
|
@ -182,7 +182,7 @@ endif
|
|
|
|
.PHONY: common-yamllint
|
|
|
|
.PHONY: common-yamllint
|
|
|
|
common-yamllint:
|
|
|
|
common-yamllint:
|
|
|
|
@echo ">> running yamllint on all YAML files in the repository"
|
|
|
|
@echo ">> running yamllint on all YAML files in the repository"
|
|
|
|
ifeq (, $(shell command -v yamllint > /dev/null))
|
|
|
|
ifeq (, $(shell command -v yamllint 2> /dev/null))
|
|
|
|
@echo "yamllint not installed so skipping"
|
|
|
|
@echo "yamllint not installed so skipping"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
yamllint .
|
|
|
|
yamllint .
|
|
|
|