Skip to content

Commit d103c1e

Browse files
authored
Update common Prometheus files (#741)
Signed-off-by: prombot <[email protected]>
1 parent a399d71 commit d103c1e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile.common

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endif
4949
GOTEST := $(GO) test
5050
GOTEST_DIR :=
5151
ifneq ($(CIRCLE_JOB),)
52-
ifneq ($(shell which gotestsum),)
52+
ifneq ($(shell command -v gotestsum > /dev/null),)
5353
GOTEST_DIR := test-results
5454
GOTEST := gotestsum --junitfile $(GOTEST_DIR)/unit-tests.xml --
5555
endif
@@ -61,7 +61,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
6161
SKIP_GOLANGCI_LINT :=
6262
GOLANGCI_LINT :=
6363
GOLANGCI_LINT_OPTS ?=
64-
GOLANGCI_LINT_VERSION ?= v1.51.2
64+
GOLANGCI_LINT_VERSION ?= v1.53.3
6565
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
6666
# windows isn't included here because of the path separator being different.
6767
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
@@ -178,7 +178,7 @@ endif
178178
.PHONY: common-yamllint
179179
common-yamllint:
180180
@echo ">> running yamllint on all YAML files in the repository"
181-
ifeq (, $(shell which yamllint))
181+
ifeq (, $(shell command -v yamllint > /dev/null))
182182
@echo "yamllint not installed so skipping"
183183
else
184184
yamllint .

0 commit comments

Comments
 (0)