Skip to content

Commit

Permalink
Merge pull request #7481 from hashicorp/dnephin/go1.14
Browse files Browse the repository at this point in the history
ci: Upgrade Go to 1.14.1
  • Loading branch information
dnephin authored Mar 24, 2020
2 parents c765780 + c5b7c07 commit 0665c56
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 4 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion build-support/docker/Build-Go.dockerfile
Original file line number Diff line number Diff line change
@@ -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/... \
Expand Down
2 changes: 1 addition & 1 deletion build-support/docker/Test-Flake.dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit 0665c56

Please sign in to comment.