Update build

.circleci/config.yml

@@ -42,15 +42,15 @@ jobs:
   test:
     docker:
     # Whenever the Go version is updated here, .promu.yml should also be updated.
-    - image: circleci/golang:1.14
+    - image: circleci/golang:1.15
     # maildev containers are for running the email tests against a "real" SMTP server.
     # See notify/email_test.go for details.
-    - image: djfarrelly/maildev@sha256:624e0ec781e11c3531da83d9448f5861f258ee008c1b2da63b3248bfd680acfa
+    - image: djfarrelly/maildev:1.1.0
       name: maildev-noauth
       entrypoint: bin/maildev
       command:
       - -v
-    - image: djfarrelly/maildev@sha256:624e0ec781e11c3531da83d9448f5861f258ee008c1b2da63b3248bfd680acfa
+    - image: djfarrelly/maildev:1.1.0
       name: maildev-auth
       entrypoint: bin/maildev
       command:
@@ -89,7 +89,7 @@ jobs:
           # likely to get OOMed and killed.
           GOOPTS: "-p 2"
     - prometheus/check_proto:
-        version: "3.12.3"
+        version: "3.15.8"
     - prometheus/store_artifact:
         file: alertmanager
     - prometheus/store_artifact:
@@ -102,13 +102,13 @@ jobs:
   mixin:
     docker:
     # Whenever the Go version is updated here, .promu.yml should also be updated.
-    - image: circleci/golang:1.14
+    - image: circleci/golang:1.16
 
     steps:
     - checkout
-    - run: cd doc/alertmanager-mixin; go install github.com/monitoring-mixins/mixtool/cmd/mixtool
-    - run: cd doc/alertmanager-mixin; go install github.com/google/go-jsonnet/cmd/jsonnetfmt
-    - run: cd doc/alertmanager-mixin; make lint
+    - run: go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest
+    - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+    - run: make -C doc/alertmanager-mixin lint
 
 workflows:
   version: 2

.gitignore

@@ -6,6 +6,7 @@
 /.build
 /.release
 /.tarballs
+/vendor
 
 !.golangci.yml
 !/cli/testdata/*.yml

.golangci.yml

@@ -1,5 +1,5 @@
+---
 run:
-  modules-download-mode: vendor
   deadline: 5m
 
 issues:

.promu.yml

@@ -10,7 +10,7 @@ build:
           path: ./cmd/alertmanager
         - name: amtool
           path: ./cmd/amtool
-    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}}

go.mod

@@ -1,37 +1,37 @@
 module github.com/prometheus/alertmanager
 
 require (
-	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d
+	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
 	github.com/cenkalti/backoff/v4 v4.1.0
 	github.com/cespare/xxhash v1.1.0
 	github.com/go-kit/kit v0.10.0
 	github.com/go-openapi/errors v0.20.0
 	github.com/go-openapi/loads v0.20.2
-	github.com/go-openapi/runtime v0.19.26
+	github.com/go-openapi/runtime v0.19.28
 	github.com/go-openapi/spec v0.20.3
-	github.com/go-openapi/strfmt v0.20.0
-	github.com/go-openapi/swag v0.19.14
+	github.com/go-openapi/strfmt v0.20.1
+	github.com/go-openapi/swag v0.19.15
 	github.com/go-openapi/validate v0.20.2
 	github.com/gofrs/uuid v4.0.0+incompatible
 	github.com/gogo/protobuf v1.3.2
 	github.com/hashicorp/go-sockaddr v1.0.2
-	github.com/hashicorp/memberlist v0.2.2
-	github.com/jessevdk/go-flags v1.4.0
+	github.com/hashicorp/memberlist v0.2.3
+	github.com/jessevdk/go-flags v1.5.0
 	github.com/kylelemons/godebug v1.1.0
 	github.com/matttproud/golang_protobuf_extensions v1.0.1
 	github.com/oklog/run v1.1.0
 	github.com/oklog/ulid v1.3.1
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_golang v1.10.0
 	github.com/prometheus/common v0.21.0
-	github.com/prometheus/exporter-toolkit v0.5.0
+	github.com/prometheus/exporter-toolkit v0.5.1
 	github.com/rs/cors v1.7.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/stretchr/testify v1.7.0
-	github.com/xlab/treeprint v1.0.0
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
-	golang.org/x/tools v0.0.0-20210106214847-113979e3529a
+	github.com/xlab/treeprint v1.1.0
+	golang.org/x/net v0.0.0-20210421230115-4e50805a0758
+	golang.org/x/tools v0.1.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
 )

scripts/genproto.sh

@@ -14,8 +14,8 @@ if ! [[ "$0" =~ "scripts/genproto.sh" ]]; then
     exit 255
 fi
 
-if ! [[ $(protoc --version) =~ "3.12.3" ]]; then
-    echo "could not find protoc 3.12.3, is it installed + in PATH?"
+if ! [[ $(protoc --version) =~ "3.15.8" ]]; then
+    echo "could not find protoc 3.15.8, is it installed + in PATH?"
     exit 255
 fi
 
@@ -24,7 +24,7 @@ go mod download
 
 INSTALL_PKGS="golang.org/x/tools/cmd/goimports github.com/gogo/protobuf/protoc-gen-gogofast"
 for pkg in ${INSTALL_PKGS}; do
-    go install -mod=vendor "$pkg"
+    go install "$pkg"
 done
 
 GOGOPROTO_ROOT="$(go list -mod=readonly -f '{{ .Dir }}' -m github.com/gogo/protobuf)"