Skip to content
This repository was archived by the owner on Mar 8, 2023. It is now read-only.

Commit f22d12d

Browse files
committed
Update common Prometheus files
Signed-off-by: prombot <[email protected]>
1 parent 4b99f0f commit f22d12d

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Diff for: .yamllint

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ rules:
1515
indentation:
1616
spaces: consistent
1717
indent-sequences: consistent
18+
key-duplicates:
19+
ignore: |
20+
config/testdata/section_key_dup.bad.yml
1821
line-length: disable
1922
truthy:
2023
ignore: |
21-
.github/workflows/ci.yml
24+
.github/workflows/*.yml

Diff for: Makefile.common

+6-3
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,22 @@ ifneq ($(shell which gotestsum),)
5555
endif
5656
endif
5757

58-
PROMU_VERSION ?= 0.13.0
58+
PROMU_VERSION ?= 0.14.0
5959
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
6060

61+
SKIP_GOLANGCI_LINT :=
6162
GOLANGCI_LINT :=
6263
GOLANGCI_LINT_OPTS ?=
63-
GOLANGCI_LINT_VERSION ?= v1.49.0
64+
GOLANGCI_LINT_VERSION ?= v1.50.1
6465
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
6566
# windows isn't included here because of the path separator being different.
6667
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
6768
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
6869
# If we're in CI and there is an Actions file, that means the linter
6970
# is being run in Actions, so we don't need to run it here.
70-
ifeq (,$(CIRCLE_JOB))
71+
ifneq (,$(SKIP_GOLANGCI_LINT))
72+
GOLANGCI_LINT :=
73+
else ifeq (,$(CIRCLE_JOB))
7174
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
7275
else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
7376
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint

0 commit comments

Comments
 (0)