Skip to content

Commit 6cb0dcc

Browse files
authored
Update common Prometheus files (prometheus#3619)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
1 parent 99bf92d commit 6cb0dcc

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.dockerignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ data/
33
.tarballs/
44

55
!.build/linux-amd64/
6-
!.build/linux-armv7/
76
!.build/linux-arm64/
7+
!.build/linux-armv7/
88
!.build/linux-ppc64le/
9-
!.build/linux-s390x/
109
!.build/linux-riscv64/
10+
!.build/linux-s390x/

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
persist-credentials: false
3232
- name: Install Go
33-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
33+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3434
with:
3535
go-version: 1.26.x
3636
- name: Install snmp_exporter/generator dependencies

Makefile.common

Lines changed: 2 additions & 2 deletions
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 ?= v2.10.1
64+
GOLANGCI_LINT_VERSION ?= v2.11.4
6565
GOLANGCI_FMT_OPTS ?=
6666
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
6767
# windows isn't included here because of the path separator being different.
@@ -90,7 +90,7 @@ ifdef DOCKERFILE_PATH
9090
$(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_PATH) in the Makefile)
9191
endif
9292

93-
DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le riscv64 s390x
93+
DOCKER_ARCHS ?= amd64 arm64 armv7 ppc64le riscv64 s390x
9494
DOCKERFILE_ARCH_EXCLUSIONS ?=
9595
DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64
9696
DOCKERFILE_VARIANTS ?= $(wildcard Dockerfile Dockerfile.*)

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
The Prometheus security policy, including how to report vulnerabilities, can be
44
found here:
55

6-
<https://prometheus.io/docs/operating/security/>
6+
[https://prometheus.io/docs/operating/security/](https://prometheus.io/docs/operating/security/)

0 commit comments

Comments
 (0)