From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Fri, 14 Aug 2020 17:09:37 +0000 (+0200)
Subject: Update to go 1.15 (#677)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5b7f4ed2a153ca4cff6360069fb4827aef83bdc1;p=blackbox_exporter.git

Update to go 1.15 (#677)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e47cc11..e21b05c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ jobs:
     # Whenever the Go version is updated here, .travis.yml and .promu.yml
     # should also be updated.
     environment:
-      DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.14-base
+      DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.15-base
 
     steps:
     - checkout
diff --git a/.promu.yml b/.promu.yml
index 4d28c06..396c1a3 100644
--- 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.14
+    version: 1.15
 repository:
     path: github.com/prometheus/blackbox_exporter
 build:
@@ -22,7 +22,6 @@ crossbuild:
         - linux/amd64
         - linux/386
         - darwin/amd64
-        - darwin/386
         - windows/amd64
         - windows/386
         - freebsd/amd64
diff --git a/.travis.yml b/.travis.yml
index 71e2bbd..c5d12c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: go
 # Whenever the Go version is updated here, .circleci/config.yml and .promu.yml
 # should also be updated.
 go:
-- 1.13.x
+- 1.15.x
 
 go_import_path: github.com/prometheus/blackbox_exporter