From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Tue, 30 Aug 2016 07:37:25 +0000 (+0200)
Subject: Use promu default go version + use 1.6 tag for cicleci tests
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=82568870cb891a9d3725b4ef0cb8dc888f4639c2;p=blackbox_exporter.git

Use promu default go version + use 1.6 tag for cicleci tests
---

diff --git a/.promu.yml b/.promu.yml
index 3c32f1e..616d539 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -1,4 +1,3 @@
-go: 1.6.2
 repository:
     path: github.com/prometheus/blackbox_exporter
 build:
diff --git a/circle.yml b/circle.yml
index f56d109..44bf4e1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     DOCKER_IMAGE_NAME: prom/blackbox-exporter
     QUAY_IMAGE_NAME: quay.io/prometheus/blackbox-exporter
-    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6.2-main
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6-main
     REPO_PATH: github.com/prometheus/blackbox_exporter
   pre:
     - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'