bump to golang 1.10 (prometheus#3856)

liguozhong · Feb 26, 2018 · 7af69ad · 7af69ad
1 parent ffa673f
commit 7af69ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: go
 
 go:
-- 1.9.x
+- 1.10.x
 - 1.x
 
 go_import_path: github.com/prometheus/prometheus

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Prometheus will now be reachable at http://localhost:9090/.
 ### Building from source
 
 To build Prometheus from the source code yourself you need to have a working
-Go environment with [version 1.9 or greater installed](http://golang.org/doc/install).
+Go environment with [version 1.10 or greater installed](http://golang.org/doc/install).
 
 You can directly use the `go` tool to download and install the `prometheus`
 and `promtool` binaries into your `GOPATH`:

diff --git 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.9-base
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.10-base
     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'
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ sudo: false @@
     language: go
     go:
-    - 1.9.x
+    - 1.10.x
     - 1.x
     go_import_path: github.com/prometheus/prometheus
@@ Expand Down @@