*: bump to Go 1.17

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
prometheus · Dec 17, 2021 · da47885 · da47885
1 parent 4017d1a
commit da47885
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 
 orbs:
   prometheus: prometheus/prometheus@0.11.0
-  go: circleci/go@0.2.0
+  go: circleci/go@1.7.0
 
 jobs:
   test_frontend:
@@ -19,7 +19,7 @@ jobs:
         command: sudo rm -rf /usr/local/go
     # Whenever the Go version is updated here, .promu.yml should also be updated.
     - go/install:
-        version: "1.16"
+        version: "1.17"
     - run:
         name: Remove generated code
         command: make clean
@@ -42,7 +42,7 @@ jobs:
   test:
     docker:
     # Whenever the Go version is updated here, .promu.yml should also be updated.
-    - image: circleci/golang:1.16
+    - image: quay.io/prometheus/golang-builder:1.17-base
     # maildev containers are for running the email tests against a "real" SMTP server.
     # See notify/email_test.go for details.
     - image: djfarrelly/maildev:1.1.0
@@ -102,7 +102,7 @@ jobs:
   mixin:
     docker:
     # Whenever the Go version is updated here, .promu.yml should also be updated.
-    - image: circleci/golang:1.16
+    - image: quay.io/prometheus/golang-builder:1.17-base
 
     steps:
     - checkout

diff --git a/.promu.yml b/.promu.yml
@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here, .travis.yml and
     # .circle/config.yml should also be updated.
-    version: 1.16
+    version: 1.17
 repository:
     path: github.com/prometheus/alertmanager
 build:

diff --git a/asset/asset.go b/asset/asset.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build dev
 // +build dev
 
 package asset

diff --git a/asset/asset_generate.go b/asset/asset_generate.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

diff --git a/asset/assets_vfsdata.go b/asset/assets_vfsdata.go
diff --git a/scripts/tools.go b/scripts/tools.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build tools
 // +build tools
 
 // Package tools tracks dependencies for tools that are required to generate the protobuf code.