Skip to content

Commit c2a2f9e

Browse files
authored
Merge pull request #287 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2 parents 915f3e9 + bdeb904 commit c2a2f9e

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/golangci-lint.yml

Lines changed: 7 additions & 5 deletions
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:
@@ -16,15 +18,15 @@ jobs:
1618
runs-on: ubuntu-latest
1719
steps:
1820
- name: Checkout repository
19-
uses: actions/checkout@v3
21+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2022
- name: install Go
21-
uses: actions/setup-go@v3
23+
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
2224
with:
23-
go-version: 1.20.x
25+
go-version: 1.21.x
2426
- name: Install snmp_exporter/generator dependencies
2527
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
2628
if: github.repository == 'prometheus/snmp_exporter'
2729
- name: Lint
28-
uses: golangci/golangci-lint-action@v3.4.0
30+
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
2931
with:
30-
version: v1.51.2
32+
version: v1.55.2

.yamllint

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ rules:
2020
config/testdata/section_key_dup.bad.yml
2121
line-length: disable
2222
truthy:
23-
ignore: |
24-
.github/workflows/*.yml
23+
check-keys: false

Makefile.common

Lines changed: 2 additions & 2 deletions
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.55.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)