status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7481 from hashicorp/dnephin/go1.14 

ci: Upgrade Go to 1.14.1
This commit is contained in:
Daniel Nephin 2020-03-24 16:23:53 -04:00 committed by GitHub
parent c765780cf1 c5b7c072fd
commit 0665c56c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -3,7 +3,7 @@ version: 2
references: references:
images: 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 middleman: &MIDDLEMAN_IMAGE hashicorp/middleman-hashicorp:0.3.40
ember: &EMBER_IMAGE circleci/node:8-browsers ember: &EMBER_IMAGE circleci/node:8-browsers

9
.github/CONTRIBUTING.md vendored
View File

@ -60,12 +60,11 @@ issue. Stale issues will be closed.
## Building Consul ## Building Consul
If you wish to work on Consul itself, you'll first need [Go](https://golang.org) 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, installed (version 1.14 is _required_).
including setting up your [GOPATH](https://golang.org/doc/code.html#GOPATH).
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 Next, clone this repository and then run `make dev`. In a few moments, you'll have a working
in `consul/bin` and `$GOPATH/bin`: `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`. >Note: `make dev` will build for your local machine's os/architecture. If you wish to build for all os/architecture combinations use `make`.

2
build-support/docker/Build-Go.dockerfile
View File

@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.13.7 ARG GOLANG_VERSION=1.14.1
FROM golang:${GOLANG_VERSION} FROM golang:${GOLANG_VERSION}
ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \ ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \

2
build-support/docker/Test-Flake.dockerfile
View File

@ -1,6 +1,6 @@
FROM travisci/ci-garnet:packer-1512502276-986baf0 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 RUN mkdir -p /home/travis/go && chown -R travis /home/travis/go