From 59968e186cf23bdc172cd7be3c3c7e22aeb600f0 Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Wed, 13 Mar 2019 14:14:48 +0800 Subject: [PATCH] upgrade go to 1.12 (#1458) Signed-off-by: rleungx --- .travis.yml | 4 ++-- Dockerfile | 2 +- README.md | 2 +- circle.yml | 2 +- go.mod | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d79c9aa387..642d4c1275a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,14 @@ cache: - $GOPATH/src/github.com/pingcap/pd/.retools go: - - 1.11.4 + - 1.12 script: - make ci matrix: include: - - go: 1.11.4 + - go: 1.12 install: - go get github.com/mattn/goveralls env: diff --git a/Dockerfile b/Dockerfile index 2209728b5a7..42973d3bc43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11.1-alpine as builder +FROM golang:1.12-alpine as builder MAINTAINER siddontang RUN apk add --no-cache \ diff --git a/README.md b/README.md index aa1b4edcec9..73a0c68f0ce 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ PD supports distribution and fault-tolerance by embedding [etcd](https://github. ## Build -1. Make sure [​*Go*​](https://golang.org/) (version 1.11+) is installed. For development, go 1.11.2+ is required. +1. Make sure [​*Go*​](https://golang.org/) (version 1.12) is installed. 2. Use `make` to install PD. PD is installed in the `bin` directory. ## Usage diff --git a/circle.yml b/circle.yml index f7a88049736..ea1bd6c7d29 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: golang:1.11.4 + - image: golang:1.12 working_directory: /go/src/github.com/pingcap/pd steps: - checkout diff --git a/go.mod b/go.mod index 321f9121e75..e264e86ef64 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/pingcap/pd +go 1.12 + require ( github.com/BurntSushi/toml v0.3.1 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect