Skip to content

Commit dfbc25b

Browse files
authored
Merge pull request #382 from prometheus/superq/update_go
Update Go modules
2 parents 1482587 + 9d646db commit dfbc25b

File tree

4 files changed

+315
-23
lines changed

4 files changed

+315
-23
lines changed

.circleci/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
version: 2.1
33

44
orbs:
5-
go: circleci/go@0.2.0
5+
go: circleci/go@1.7.1
66

77
jobs:
88
test:
@@ -14,6 +14,9 @@ jobs:
1414
default: true
1515
docker:
1616
- image: cimg/go:<< parameters.go_version >>
17+
environment:
18+
# Override Go 1.18 security deprecations.
19+
GODEBUG: "x509sha1=1,tls10default=1"
1720
steps:
1821
- checkout
1922
- when:
@@ -91,7 +94,6 @@ workflows:
9194
matrix:
9295
parameters:
9396
go_version:
94-
- "1.16"
9597
- "1.17"
9698
- "1.18"
9799
- test-assets:

.github/workflows/golangci-lint.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ jobs:
2020
- name: install Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: 1.17.x
23+
go-version: 1.18.x
24+
- name: Install snmp_exporter/generator dependencies
25+
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
26+
if: github.repository == 'prometheus/snmp_exporter'
2427
- name: Lint
25-
uses: golangci/golangci-lint-action@v3.1.0
28+
uses: golangci/golangci-lint-action@v3.2.0
2629
with:
27-
version: v1.44.2
30+
version: v1.45.2

go.mod

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

3+
go 1.17
4+
35
require (
4-
github.com/go-kit/log v0.2.0
6+
github.com/go-kit/log v0.2.1
57
github.com/golang/protobuf v1.5.2
68
github.com/julienschmidt/httprouter v1.3.0
79
github.com/matttproud/golang_protobuf_extensions v1.0.1
810
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
9-
github.com/prometheus/client_golang v1.12.1
11+
github.com/prometheus/client_golang v1.13.0
1012
github.com/prometheus/client_model v0.2.0
11-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
12-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
13+
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48
14+
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c
1315
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1416
gopkg.in/yaml.v2 v2.4.0
1517
)
1618

17-
go 1.16
19+
require (
20+
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
21+
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24+
github.com/go-logfmt/logfmt v0.5.1 // indirect
25+
github.com/jpillora/backoff v1.0.0 // indirect
26+
github.com/prometheus/procfs v0.8.0 // indirect
27+
github.com/stretchr/testify v1.8.0 // indirect
28+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
29+
golang.org/x/text v0.3.7 // indirect
30+
google.golang.org/appengine v1.6.7 // indirect
31+
google.golang.org/protobuf v1.28.1 // indirect
32+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
33+
)

0 commit comments

Comments
 (0)