Update build

* Drop /vendor. * Update Go modules. * Add more Docker archs. * Bump Prometheus Orb version. #209 Signed-off-by: Ben Kochie <[email protected]>
prometheus · Mar 12, 2021 · 498b0a2 · 498b0a2
1 parent 076b0fe
commit 498b0a2
Show file tree

Hide file tree

Showing 696 changed files with 13 additions and 251,746 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,14 +2,14 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.4.0
+  prometheus: prometheus/prometheus@0.9.0
 
 jobs:
   test:
     # Whenever the Go version is updated here, .promu.yml
     # should also be updated.
     docker:
-    - image: circleci/golang:1.15
+    - image: circleci/golang:1.16
 
     steps:
     - prometheus/setup_environment

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,3 @@
-run:
-  modules-download-mode: vendor
-
 # Run only staticcheck for now. Additional linters will be enabled one-by-one.
 linters:
   enable:

diff --git a/.promu.yml b/.promu.yml
@@ -1,11 +1,11 @@
 go:
     # Whenever the Go version is updated here,
     # .circle/config.yml should also be updated.
-    version: 1.15
+    version: 1.16
 repository:
     path: github.com/prometheus/haproxy_exporter
 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}}

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # Needs to be defined before including Makefile.common to auto-generate targets
-DOCKER_ARCHS ?= amd64 armv7 arm64
+DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
 DOCKER_IMAGE_NAME ?= haproxy-exporter
 
 all:: vet checkmetrics common-all

diff --git a/go.mod b/go.mod
@@ -5,9 +5,8 @@ go 1.14
 require (
 	github.com/alecthomas/units v0.0.0-20201120081800-1786d5ef83d4 // indirect
 	github.com/go-kit/kit v0.10.0
-	github.com/prometheus/client_golang v1.8.0
-	github.com/prometheus/common v0.15.0
-	golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d // indirect
+	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/common v0.18.0
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )
diff --git a/go.sum b/go.sum
diff --git a/vendor/github.com/alecthomas/template/LICENSE b/vendor/github.com/alecthomas/template/LICENSE
diff --git a/vendor/github.com/alecthomas/template/README.md b/vendor/github.com/alecthomas/template/README.md