Skip to content

Commit

Permalink
Update build
Browse files Browse the repository at this point in the history
* Drop /vendor.
* Update Go modules.
* Bump minimum Go version to 1.13.
* Bump prometheus orb.

Signed-off-by: Ben Kochie <[email protected]>
  • Loading branch information
SuperQ committed Mar 18, 2021
1 parent 6800dee commit 5dab53d
Show file tree
Hide file tree
Showing 837 changed files with 35 additions and 345,075 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 2.1

orbs:
prometheus: prometheus/prometheus@0.4.0
prometheus: prometheus/prometheus@0.10.0

executors:
# Whenever the Go version is updated here, .promu.yml should also be updated.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
*~
*.exe
*.tar.gz
/vendor
3 changes: 0 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
run:
modules-download-mode: vendor

# Run only staticcheck for now. Additional linters will be enabled one-by-one.
linters:
enable:
Expand Down
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go:
repository:
path: github.com/prometheus/pushgateway
build:
flags: -mod=vendor -a -tags netgo
flags: -a -tags netgo
ldflags: |
-X github.com/prometheus/common/version.Version={{.Version}}
-X github.com/prometheus/common/version.Revision={{.Revision}}
Expand Down
14 changes: 4 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,15 @@ module github.com/prometheus/pushgateway

require (
github.com/go-kit/kit v0.10.0
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.2 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/golang/protobuf v1.5.1
github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/client_golang v1.10.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.15.0
github.com/prometheus/common v0.19.0
github.com/prometheus/exporter-toolkit v0.5.1
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
github.com/stretchr/testify v1.6.1 // indirect
golang.org/x/tools v0.0.0-20201215192005-fa10ef0b8743 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
)

go 1.11
go 1.13
63 changes: 28 additions & 35 deletions go.sum

Large diffs are not rendered by default.

27 changes: 0 additions & 27 deletions vendor/github.com/alecthomas/template/LICENSE

This file was deleted.

25 changes: 0 additions & 25 deletions vendor/github.com/alecthomas/template/README.md

This file was deleted.

Loading

0 comments on commit 5dab53d

Please sign in to comment.