Skip to content

Commit d4af942

Browse files
authored
Merge pull request prometheus-community#745 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2 parents 169bb0c + 29cf7eb commit d4af942

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.yamllint

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ rules:
2121
line-length: disable
2222
truthy:
2323
ignore: |
24-
.github/workflows/codeql-analysis.yml
25-
.github/workflows/funcbench.yml
26-
.github/workflows/fuzzing.yml
27-
.github/workflows/prombench.yml
28-
.github/workflows/golangci-lint.yml
24+
.github/workflows/*.yml

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.49.0
64+
GOLANGCI_LINT_VERSION ?= v1.50.1
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))

0 commit comments

Comments
 (0)