From b07768f613360f643bfd95be939f14698fb06bf1 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Thu, 5 May 2016 12:09:09 +0200
Subject: [PATCH 1/3] Fix CircleCI problems during go get promu

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 18406202d..32e155b11 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,7 +13,7 @@ machine:
 
 dependencies:
   pre:
-    - go get -u github.com/prometheus/promu
+    - make promu
     - docker info
   override:
     - promu crossbuild

From a2b913f018311ac68dcd3da8ce7fbfc495b67c85 Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Thu, 5 May 2016 12:09:29 +0200
Subject: [PATCH 2/3] Change the test docker image tag to match promu golang
 version

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 32e155b11..7c5b90db8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     DOCKER_IMAGE_NAME: prom/prometheus
     QUAY_IMAGE_NAME: quay.io/prometheus/prometheus
-    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.5.4-main
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6.2-main
     REPO_PATH: github.com/prometheus/prometheus
   pre:
     - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'

From d00e8f114d315f48d1f00f887e4216442346a0bb Mon Sep 17 00:00:00 2001
From: Steve Durrheimer <s.durrheimer@gmail.com>
Date: Thu, 5 May 2016 13:55:08 +0200
Subject: [PATCH 3/3] Fallback to default promu's crossbuild platforms list

---
 .promu.yml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.promu.yml b/.promu.yml
index 72d7943b8..6e371cc17 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -7,7 +7,7 @@ build:
           path: ./cmd/prometheus
         - name: promtool
           path: ./cmd/promtool
-    flags: -tags netgo
+    flags: -a -tags netgo
     ldflags: |
         -X {{repoPath}}/version.Version={{.Version}}
         -X {{repoPath}}/version.Revision={{.Revision}}
@@ -21,25 +21,3 @@ tarball:
         - documentation/examples/prometheus.yml
         - LICENSE
         - NOTICE
-crossbuild:
-    platforms:
-        - linux/amd64
-        - linux/386
-        - darwin/amd64
-        - darwin/386
-        - windows/amd64
-        - windows/386
-        - freebsd/amd64
-        - freebsd/386
-        - openbsd/amd64
-        - openbsd/386
-        - netbsd/amd64
-        - netbsd/386
-        - dragonfly/amd64
-        - linux/arm
-        - linux/arm64
-        - freebsd/arm
-        - openbsd/arm
-        - netbsd/arm
-        - linux/ppc64
-        - linux/ppc64le