Skip to content

Commit 77ee449

Browse files
author
Julien Pivotto
authored
Merge pull request #447 from prometheus/superq/bump_go
Update Go versions
2 parents d25d305 + 2cd3d6e commit 77ee449

File tree

8 files changed

+63
-912
lines changed

8 files changed

+63
-912
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ workflows:
9595
matrix:
9696
parameters:
9797
go_version:
98-
- "1.17"
9998
- "1.18"
10099
- "1.19"
100+
- "1.20"
101101
- test-assets:
102102
name: assets-go-<< matrix.go_version >>
103103
matrix:
104104
parameters:
105105
go_version:
106-
- "1.19"
106+
- "1.20"
107107
- style:
108108
name: style
109-
go_version: "1.19"
109+
go_version: "1.20"

.github/workflows/golangci-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
- name: install Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: 1.18.x
23+
go-version: 1.20.x
2424
- name: Install snmp_exporter/generator dependencies
2525
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
2626
if: github.repository == 'prometheus/snmp_exporter'
2727
- name: Lint
28-
uses: golangci/golangci-lint-action@v3.2.0
28+
uses: golangci/golangci-lint-action@v3.4.0
2929
with:
30-
version: v1.45.2
30+
version: v1.51.2

Makefile.common

Lines changed: 1 addition & 1 deletion
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 ?= v1.50.1
64+
GOLANGCI_LINT_VERSION ?= v1.51.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))

assets/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/prometheus/common/assets
22

3-
go 1.17
3+
go 1.18

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/prometheus/common
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/go-kit/log v0.2.1
@@ -11,7 +11,7 @@ require (
1111
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
1212
github.com/prometheus/client_golang v1.14.0
1313
github.com/prometheus/client_model v0.3.0
14-
golang.org/x/net v0.4.0
14+
golang.org/x/net v0.7.0
1515
golang.org/x/oauth2 v0.3.0
1616
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1717
gopkg.in/yaml.v2 v2.4.0
@@ -28,8 +28,8 @@ require (
2828
github.com/modern-go/reflect2 v1.0.2 // indirect
2929
github.com/prometheus/procfs v0.8.0 // indirect
3030
github.com/stretchr/testify v1.8.0 // indirect
31-
golang.org/x/sys v0.3.0 // indirect
32-
golang.org/x/text v0.5.0 // indirect
31+
golang.org/x/sys v0.5.0 // indirect
32+
golang.org/x/text v0.7.0 // indirect
3333
google.golang.org/appengine v1.6.7 // indirect
3434
google.golang.org/protobuf v1.28.1 // indirect
3535
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

Lines changed: 6 additions & 441 deletions
Large diffs are not rendered by default.

sigv4/go.mod

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/prometheus/common/sigv4
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/aws/aws-sdk-go v1.43.26
7-
github.com/prometheus/client_golang v1.13.1
8-
github.com/prometheus/common v0.37.0
9-
github.com/stretchr/testify v1.7.1
7+
github.com/prometheus/client_golang v1.14.0
8+
github.com/prometheus/common v0.39.0
9+
github.com/stretchr/testify v1.8.0
1010
gopkg.in/yaml.v2 v2.4.0
1111
)
1212

@@ -17,16 +17,17 @@ require (
1717
github.com/golang/protobuf v1.5.2 // indirect
1818
github.com/jmespath/go-jmespath v0.4.0 // indirect
1919
github.com/jpillora/backoff v1.0.0 // indirect
20-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
20+
github.com/kr/pretty v0.3.1 // indirect
21+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
2122
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
2223
github.com/pmezard/go-difflib v1.0.0 // indirect
23-
github.com/prometheus/client_model v0.2.0 // indirect
24+
github.com/prometheus/client_model v0.3.0 // indirect
2425
github.com/prometheus/procfs v0.8.0 // indirect
25-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
26-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
27-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
28-
golang.org/x/text v0.3.7 // indirect
29-
google.golang.org/appengine v1.6.6 // indirect
26+
golang.org/x/net v0.4.0 // indirect
27+
golang.org/x/oauth2 v0.3.0 // indirect
28+
golang.org/x/sys v0.3.0 // indirect
29+
golang.org/x/text v0.5.0 // indirect
30+
google.golang.org/appengine v1.6.7 // indirect
3031
google.golang.org/protobuf v1.28.1 // indirect
31-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
32+
gopkg.in/yaml.v3 v3.0.1 // indirect
3233
)

sigv4/go.sum

Lines changed: 32 additions & 447 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)