Skip to content

Commit e7082f9

Browse files
prombotraedtwj
authored andcommitted
Update common Prometheus files
Signed-off-by: prombot <[email protected]> Signed-off-by: raed altuwaijri <[email protected]>
1 parent d38d554 commit e7082f9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/golangci-lint.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
---
2+
# This action is synced from https://github.com/prometheus/prometheus
13
name: golangci-lint
24
on:
35
push:
@@ -27,4 +29,4 @@ jobs:
2729
- name: Lint
2830
uses: golangci/[email protected]
2931
with:
30-
version: v1.51.2
32+
version: v1.54.2

Makefile.common

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ ifneq ($(shell command -v gotestsum > /dev/null),)
5555
endif
5656
endif
5757

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

6161
SKIP_GOLANGCI_LINT :=
6262
GOLANGCI_LINT :=
6363
GOLANGCI_LINT_OPTS ?=
64-
GOLANGCI_LINT_VERSION ?= v1.53.3
64+
GOLANGCI_LINT_VERSION ?= v1.54.2
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)