Skip to content

Commit 66ba8a5

Browse files
committed
Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
1 parent 4099e2a commit 66ba8a5

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/container_description.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
2222
steps:
2323
- name: git checkout
24-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
24+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2525
with:
2626
persist-credentials: false
2727
- name: Set docker hub repo name
@@ -45,7 +45,7 @@ jobs:
4545
if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
4646
steps:
4747
- name: git checkout
48-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
48+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4949
with:
5050
persist-credentials: false
5151
- name: Set quay.io org name

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
29+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3030
with:
3131
persist-credentials: false
3232
- name: Install Go

.github/workflows/govulncheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
2929
if: github.repository == 'prometheus/snmp_exporter'
3030
- id: govulncheck
31-
uses: golang/govulncheck-action@3fa7bd9cee2cfdf3499a8803b226e43de7b7cdb4 # master
31+
uses: golang/govulncheck-action@032d45514ae346b1db93c04b0c90b841c370344f # master
3232
env:
3333
GOOS: ${{ contains(github.repository, 'windows_exporter') && 'windows' || '' }}

Makefile.common

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ common-deps:
166166
update-go-deps:
167167
@echo ">> updating Go dependencies"
168168
@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
169-
$(GO) get $$m; \
169+
# Prevent go get from pulling deps that require a newer Go version.
170+
GOTOOLCHAIN=go$$($(GO) mod edit -json | jq -r .Go) $(GO) get $$m; \
170171
done
171172
$(GO) mod tidy
172173

0 commit comments

Comments
 (0)