Skip to content

Commit 0e96cce

Browse files
prombotgitperr
authored andcommitted
Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
1 parent 3c26607 commit 0e96cce

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/golangci-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
- name: Lint
3636
uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
3737
with:
38-
version: v1.55.2
38+
version: v1.56.2

.yamllint

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
22
extends: default
3+
ignore: |
4+
ui/react-app/node_modules
35

46
rules:
57
braces:

Makefile.common

+3-3
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 command -v gotestsum > /dev/null),)
52+
ifneq ($(shell command -v gotestsum 2> /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.55.2
64+
GOLANGCI_LINT_VERSION ?= v1.56.2
6565
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
6666
# windows isn't included here because of the path separator being different.
6767
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
@@ -182,7 +182,7 @@ endif
182182
.PHONY: common-yamllint
183183
common-yamllint:
184184
@echo ">> running yamllint on all YAML files in the repository"
185-
ifeq (, $(shell command -v yamllint > /dev/null))
185+
ifeq (, $(shell command -v yamllint 2> /dev/null))
186186
@echo "yamllint not installed so skipping"
187187
else
188188
yamllint .

0 commit comments

Comments
 (0)