From b2502b5e53001dd4119ce7e7f53aa35fa65ba71d Mon Sep 17 00:00:00 2001 From: William Banfield <4561443+williambanfield@users.noreply.github.com> Date: Fri, 2 Jul 2021 14:39:50 -0400 Subject: [PATCH] tooling: use go version 1.16 as minimum version (#6642) --- DOCKER/Dockerfile | 2 +- DOCKER/Dockerfile.build_c-amazonlinux | 2 +- README.md | 4 ++-- UPGRADING.md | 2 +- docs/tutorials/go-built-in.md | 2 +- docs/tutorials/go.md | 4 ++-- go.mod | 2 +- networks/remote/integration.sh | 4 ++-- test/docker/Dockerfile | 2 +- test/e2e/docker/Dockerfile | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 79b1e9b5f..0465bec09 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -1,5 +1,5 @@ # stage 1 Generate Tendermint Binary -FROM golang:1.15-alpine as builder +FROM golang:1.16-alpine as builder RUN apk update && \ apk upgrade && \ apk --no-cache add make diff --git a/DOCKER/Dockerfile.build_c-amazonlinux b/DOCKER/Dockerfile.build_c-amazonlinux index 05bc7e265..df492d188 100644 --- a/DOCKER/Dockerfile.build_c-amazonlinux +++ b/DOCKER/Dockerfile.build_c-amazonlinux @@ -9,7 +9,7 @@ RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm & RUN yum -y groupinstall "Development Tools" RUN yum -y install leveldb-devel which -ENV GOVERSION=1.12.9 +ENV GOVERSION=1.16.5 RUN cd /tmp && \ wget https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz && \ diff --git a/README.md b/README.md index 1d89e0b75..d1e1df6dd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Or [Blockchain](), for shor [![version](https://img.shields.io/github/tag/tendermint/tendermint.svg)](https://github.com/tendermint/tendermint/releases/latest) [![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://pkg.go.dev/github.com/tendermint/tendermint) -[![Go version](https://img.shields.io/badge/go-1.15-blue.svg)](https://github.com/moovweb/gvm) +[![Go version](https://img.shields.io/badge/go-1.16-blue.svg)](https://github.com/moovweb/gvm) [![Discord chat](https://img.shields.io/discord/669268347736686612.svg)](https://discord.gg/vcExX9T) [![license](https://img.shields.io/github/license/tendermint/tendermint.svg)](https://github.com/tendermint/tendermint/blob/master/LICENSE) [![tendermint/tendermint](https://tokei.rs/b1/github/tendermint/tendermint?category=lines)](https://github.com/tendermint/tendermint) @@ -48,7 +48,7 @@ to notify you of vulnerabilities and fixes in Tendermint Core. You can subscribe | Requirement | Notes | |-------------|------------------| -| Go version | Go1.15 or higher | +| Go version | Go1.16 or higher | ## Documentation diff --git a/UPGRADING.md b/UPGRADING.md index 667228328..3da845b7a 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -80,7 +80,7 @@ will need to change to accommodate these changes. Most notably: This release is not compatible with previous blockchains due to changes to the encoding format (see "Protocol Buffers," below) and the block header (see "Blockchain Protocol"). -Note also that Tendermint 0.34 also requires Go 1.15 or higher. +Note also that Tendermint 0.34 also requires Go 1.16 or higher. ### ABCI Changes diff --git a/docs/tutorials/go-built-in.md b/docs/tutorials/go-built-in.md index f69f679e3..81325706b 100644 --- a/docs/tutorials/go-built-in.md +++ b/docs/tutorials/go-built-in.md @@ -40,7 +40,7 @@ Verify that you have the latest version of Go installed: ```bash $ go version -go version go1.15.x darwin/amd64 +go version go1.16.x darwin/amd64 ``` ## 1.2 Creating a new Go project diff --git a/docs/tutorials/go.md b/docs/tutorials/go.md index 02625291f..9461f2cea 100644 --- a/docs/tutorials/go.md +++ b/docs/tutorials/go.md @@ -43,7 +43,7 @@ Verify that you have the latest version of Go installed: ```bash $ go version -go version go1.15.x darwin/amd64 +go version go1.16.x darwin/amd64 ``` ## 1.2 Creating a new Go project @@ -446,7 +446,7 @@ This will populate the `go.mod` with a release number followed by a hash for Ten ```go module github.com/me/example -go 1.15 +go 1.16 require ( github.com/dgraph-io/badger v1.6.2 diff --git a/go.mod b/go.mod index 37e5112b8..6e71ad45c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/tendermint/tendermint -go 1.15 +go 1.16 require ( github.com/BurntSushi/toml v0.3.1 diff --git a/networks/remote/integration.sh b/networks/remote/integration.sh index 4c7132865..0960f8962 100644 --- a/networks/remote/integration.sh +++ b/networks/remote/integration.sh @@ -10,8 +10,8 @@ sudo apt-get upgrade -y sudo apt-get install -y jq unzip python-pip software-properties-common make # get and unpack golang -curl -O https://dl.google.com/go/go1.15.4.linux-amd64.tar.gz -tar -xvf go1.15.4.linux-amd64.tar.gz +curl -O https://dl.google.com/go/go1.16.5.linux-amd64.tar.gz +tar -xvf go1.16.5.linux-amd64.tar.gz ## move binary and add to path mv go /usr/local diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 3628be9f9..9110b4bf5 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 +FROM golang:1.16 # Grab deps (jq, hexdump, xxd, killall) RUN apt-get update && \ diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile index d32e70804..68c7bc836 100644 --- a/test/e2e/docker/Dockerfile +++ b/test/e2e/docker/Dockerfile @@ -1,7 +1,7 @@ # We need to build in a Linux environment to support C libraries, e.g. RocksDB. # We use Debian instead of Alpine, so that we can use binary database packages # instead of spending time compiling them. -FROM golang:1.15 +FROM golang:1.16 RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null RUN apt-get -qq install -y libleveldb-dev librocksdb-dev >/dev/null