File tree Expand file tree Collapse file tree 3 files changed +23
-12
lines changed
Expand file tree Collapse file tree 3 files changed +23
-12
lines changed Original file line number Diff line number Diff line change 1818 if : github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
1919 steps :
2020 - name : git checkout
21- uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
21+ uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+ with :
23+ persist-credentials : false
2224 - name : Set docker hub repo name
2325 run : echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
2426 - name : Push README to Dockerhub
4042 if : github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
4143 steps :
4244 - name : git checkout
43- uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
45+ uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
46+ with :
47+ persist-credentials : false
4448 - name : Set quay.io org name
4549 run : echo "DOCKER_REPO=$(echo quay.io/${GITHUB_REPOSITORY_OWNER} | tr -d '-')" >> $GITHUB_ENV
4650 - name : Set quay.io repo name
Original file line number Diff line number Diff line change @@ -24,16 +24,18 @@ jobs:
2424 runs-on : ubuntu-latest
2525 steps :
2626 - name : Checkout repository
27- uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
27+ uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+ with :
29+ persist-credentials : false
2830 - name : Install Go
29- uses : actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4 .0
31+ uses : actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5 .0
3032 with :
31- go-version : 1.24 .x
33+ go-version : 1.25 .x
3234 - name : Install snmp_exporter/generator dependencies
3335 run : sudo apt-get update && sudo apt-get -y install libsnmp-dev
3436 if : github.repository == 'prometheus/snmp_exporter'
3537 - name : Lint
36- uses : golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7 .0.0
38+ uses : golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8 .0.0
3739 with :
3840 args : --verbose
39- version : v2.0.2
41+ version : v2.2.1
Original file line number Diff line number Diff line change @@ -61,7 +61,8 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
6161SKIP_GOLANGCI_LINT :=
6262GOLANGCI_LINT :=
6363GOLANGCI_LINT_OPTS ?=
64- GOLANGCI_LINT_VERSION ?= v2.0.2
64+ GOLANGCI_LINT_VERSION ?= v2.2.1
65+ GOLANGCI_FMT_OPTS ?=
6566# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
6667# windows isn't included here because of the path separator being different.
6768ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
@@ -138,7 +139,7 @@ common-deps:
138139update-go-deps:
139140 @echo ">> updating Go dependencies"
140141 @for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
141- $(GO) get -d $$m; \
142+ $(GO) get $$m; \
142143 done
143144 $(GO) mod tidy
144145
@@ -156,9 +157,13 @@ $(GOTEST_DIR):
156157 @mkdir -p $@
157158
158159.PHONY: common-format
159- common-format:
160+ common-format: $(GOLANGCI_LINT)
160161 @echo ">> formatting code"
161162 $(GO) fmt $(pkgs)
163+ ifdef GOLANGCI_LINT
164+ @echo ">> formatting code with golangci-lint"
165+ $(GOLANGCI_LINT) fmt $(GOLANGCI_FMT_OPTS)
166+ endif
162167
163168.PHONY: common-vet
164169common-vet:
@@ -248,8 +253,8 @@ $(PROMU):
248253 cp $(PROMU_TMP)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM)/promu $(FIRST_GOPATH)/bin/promu
249254 rm -r $(PROMU_TMP)
250255
251- .PHONY: proto
252- proto:
256+ .PHONY: common- proto
257+ common- proto:
253258 @echo ">> generating code from proto files"
254259 @./scripts/genproto.sh
255260
You can’t perform that action at this time.
0 commit comments