From c5b7c072fde4caae06fa705269e430745654374c Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Mon, 23 Mar 2020 13:35:35 -0400 Subject: [PATCH] ci: Upgrade Go to 1.14.1 --- .circleci/config.yml | 2 +- .github/CONTRIBUTING.md | 9 ++++----- build-support/docker/Build-Go.dockerfile | 2 +- build-support/docker/Test-Flake.dockerfile | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f381d7293..5d233355bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 references: images: - go: &GOLANG_IMAGE circleci/golang:1.13.7 + go: &GOLANG_IMAGE circleci/golang:1.14.1 middleman: &MIDDLEMAN_IMAGE hashicorp/middleman-hashicorp:0.3.40 ember: &EMBER_IMAGE circleci/node:8-browsers diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b9d568cf7c..1faf1caf40 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -60,12 +60,11 @@ issue. Stale issues will be closed. ## Building Consul If you wish to work on Consul itself, you'll first need [Go](https://golang.org) -installed (version 1.13 is _required_). Make sure you have Go properly installed, -including setting up your [GOPATH](https://golang.org/doc/code.html#GOPATH). +installed (version 1.14 is _required_). -Next, clone this repository into `$GOPATH/src/github.com/hashicorp/consul` and -then run `make dev`. In a few moments, you'll have a working `consul` executable -in `consul/bin` and `$GOPATH/bin`: + +Next, clone this repository and then run `make dev`. In a few moments, you'll have a working +`consul` executable in `consul/bin` and `$GOPATH/bin`: >Note: `make dev` will build for your local machine's os/architecture. If you wish to build for all os/architecture combinations use `make`. diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile index c70183eb0d..98943dd77d 100644 --- a/build-support/docker/Build-Go.dockerfile +++ b/build-support/docker/Build-Go.dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.13.7 +ARG GOLANG_VERSION=1.14.1 FROM golang:${GOLANG_VERSION} ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \ diff --git a/build-support/docker/Test-Flake.dockerfile b/build-support/docker/Test-Flake.dockerfile index dd32dd5388..876de0b0b5 100644 --- a/build-support/docker/Test-Flake.dockerfile +++ b/build-support/docker/Test-Flake.dockerfile @@ -1,6 +1,6 @@ FROM travisci/ci-garnet:packer-1512502276-986baf0 -ENV GOLANG_VERSION 1.13.7 +ENV GOLANG_VERSION 1.14.1 RUN mkdir -p /home/travis/go && chown -R travis /home/travis/go