Skip to content

Commit

Permalink
Update Go versions
Browse files Browse the repository at this point in the history
* Add Go 1.20.
* Set minimum Go version to 1.18.
* Bump golang.org/x/net.

Signed-off-by: SuperQ <superq@gmail.com>
  • Loading branch information
SuperQ committed Feb 23, 2023
1 parent f9c1994 commit 95dee7d
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 912 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Expand Up @@ -95,15 +95,15 @@ workflows:
matrix:
parameters:
go_version:
- "1.17"
- "1.18"
- "1.19"
- "1.20"
- test-assets:
name: assets-go-<< matrix.go_version >>
matrix:
parameters:
go_version:
- "1.19"
- "1.20"
- style:
name: style
go_version: "1.19"
go_version: "1.20"
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
Expand Up @@ -20,11 +20,11 @@ jobs:
- name: install Go
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Install snmp_exporter/generator dependencies
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
if: github.repository == 'prometheus/snmp_exporter'
- name: Lint
uses: golangci/golangci-lint-action@v3.2.0
uses: golangci/golangci-lint-action@v3.4.0
with:
version: v1.45.2
version: v1.51.2
2 changes: 1 addition & 1 deletion Makefile.common
Expand Up @@ -61,7 +61,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
SKIP_GOLANGCI_LINT :=
GOLANGCI_LINT :=
GOLANGCI_LINT_OPTS ?=
GOLANGCI_LINT_VERSION ?= v1.50.1
GOLANGCI_LINT_VERSION ?= v1.51.2
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
# windows isn't included here because of the path separator being different.
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
Expand Down
2 changes: 1 addition & 1 deletion assets/go.mod
@@ -1,3 +1,3 @@
module github.com/prometheus/common/assets

go 1.17
go 1.19
8 changes: 4 additions & 4 deletions go.mod
@@ -1,6 +1,6 @@
module github.com/prometheus/common

go 1.17
go 1.18

require (
github.com/go-kit/log v0.2.1
Expand All @@ -11,7 +11,7 @@ require (
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
golang.org/x/net v0.4.0
golang.org/x/net v0.7.0
golang.org/x/oauth2 v0.3.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -28,8 +28,8 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/stretchr/testify v1.8.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
Expand Down
447 changes: 6 additions & 441 deletions go.sum

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions sigv4/go.mod
@@ -1,12 +1,12 @@
module github.com/prometheus/common/sigv4

go 1.17
go 1.19

require (
github.com/aws/aws-sdk-go v1.43.26
github.com/prometheus/client_golang v1.13.1
github.com/prometheus/common v0.37.0
github.com/stretchr/testify v1.7.1
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.39.0
github.com/stretchr/testify v1.8.0
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -17,16 +17,17 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.6 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
479 changes: 32 additions & 447 deletions sigv4/go.sum

Large diffs are not rendered by default.

0 comments on commit 95dee7d

Please sign in to comment.