From 16c6d120d68249a626a37e5c1b5f11d5e319e852 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Tue, 30 Aug 2016 09:23:02 +0200
Subject: [PATCH] Use promu default go version + use 1.6 tag for cicleci tests

---
 .promu.yml | 1 -
 circle.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.promu.yml b/.promu.yml
index e2a28192..c09fa682 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -1,4 +1,3 @@
-go: 1.6.2
 repository:
     path: github.com/prometheus/alertmanager
 build:
diff --git a/circle.yml b/circle.yml
index a7f538e4..ae5603d5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     DOCKER_IMAGE_NAME: prom/alertmanager
     QUAY_IMAGE_NAME: quay.io/prometheus/alertmanager
-    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/alertmanager
   pre:
     - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'