Merge pull request #294 from prometheus/sdurrheimer-use-promu-default-go-version

Use promu default go version + use 1.6 tag for cicleci tests
2016-08-31 09:00:12 +02:00 · 2016-08-31 09:00:12 +02:00 · 1549f3087d
parent 0f2a87ab22 db0042152b
commit 1549f3087d
2 changed files with 1 additions and 2 deletions
--- a/.promu.yml
+++ b/.promu.yml
@ -1,4 +1,3 @@
-go: 1.6.2
 repository:
    path: github.com/prometheus/node_exporter
 build:
--- a/circle.yml
+++ b/circle.yml
@ -2,7 +2,7 @@ machine:
  environment:
    DOCKER_IMAGE_NAME: prom/node-exporter
    QUAY_IMAGE_NAME: quay.io/prometheus/node-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/node_exporter
  pre:
    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'