From dcd671db29a74463309e9b2235e55853ce37e22a Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Tue, 27 Jul 2021 20:12:16 +0800 Subject: [PATCH] *: update go version to 1.16 (#1698) (#1922) --- .github/workflows/binlog-999999.yml | 4 ++-- CONTRIBUTING.md | 2 +- Dockerfile | 2 +- go.mod | 2 +- go.sum | 3 --- step_by_step_contribute.md | 2 +- tests/tiup/docker/control/Dockerfile | 2 +- tests/tiup/docker/node/Dockerfile | 2 +- tools/go.mod | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/binlog-999999.yml b/.github/workflows/binlog-999999.yml index b43afc81db..c56ea20c81 100644 --- a/.github/workflows/binlog-999999.yml +++ b/.github/workflows/binlog-999999.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-18.04 steps: - - name: Set up Go 1.13 + - name: Set up Go 1.16 uses: actions/setup-go@v2 with: - go-version: 1.13 + go-version: 1.16 - name: Check out code uses: actions/checkout@v2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2f729e34d..31503c5648 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ See [Step by Step Contribute Example](step_by_step_contribute.md) for a more det Developing DM requires: -* [Go 1.13+](http://golang.org/doc/code.html) +* [Go 1.16+](http://golang.org/doc/code.html) * An internet connection to download the dependencies Simply run `make` to build the program. diff --git a/Dockerfile b/Dockerfile index d228127e68..0663009aa2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-alpine as builder +FROM golang:1.16-alpine as builder MAINTAINER siddontang RUN apk add --no-cache git make diff --git a/go.mod b/go.mod index 5b8473bc5d..24eccefe7a 100644 --- a/go.mod +++ b/go.mod @@ -48,4 +48,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) -go 1.13 +go 1.16 diff --git a/go.sum b/go.sum index 8c8bcabdc7..9f4580e88b 100644 --- a/go.sum +++ b/go.sum @@ -165,7 +165,6 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/codahale/hdrhistogram v0.9.0 h1:9GjrtRI+mLEFPtTfR/AZhcxp+Ii8NZYWq5104FbZQY0= github.com/codahale/hdrhistogram v0.9.0/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c= github.com/coocood/badger v1.5.1-0.20200515070411-e02af0688441/go.mod h1:klY8SfH2lNZ/23/SIxwHoJw+T6wYGB12YPCF9MUoiu0= @@ -271,7 +270,6 @@ github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHqu github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.11.1 h1:stwUsXhUGliQs9t0ZS39BWCltFdOHgABiIlihop8AD4= github.com/frankban/quicktest v1.11.1/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsouza/fake-gcs-server v1.15.0/go.mod h1:HNxAJ/+FY/XSsxuwz8iIYdp2GtMmPbJ8WQjjGMxd6Qk= github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw= @@ -1094,7 +1092,6 @@ github.com/xitongsys/parquet-go v1.5.1/go.mod h1:xUxwM8ELydxh4edHGegYq1pA8NnMKDx github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457 h1:tBbuFCtyJNKT+BFAv6qjvTFpVdy97IYNaBwGUXifIUs= github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457/go.mod h1:pheqtXeHQFzxJk45lRQ0UIGIivKnLXvialZSFWs81A8= github.com/xitongsys/parquet-go-source v0.0.0-20190524061010-2b72cbee77d5/go.mod h1:xxCx7Wpym/3QCo6JhujJX51dzSXrwmb0oH6FQb39SEA= -github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0 h1:a742S4V5A15F93smuVxA60LQWsrCnN8bKeWDBARU1/k= github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0/go.mod h1:HYhIKsdns7xz80OgkbgJYrtQY7FjHWHKH6cvN7+czGE= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xo/dburl v0.0.0-20191219122722-3cca8608d645/go.mod h1:A47W3pdWONaZmXuLZgfKLAVgUY0qvfTRM5vVDKS40S4= diff --git a/step_by_step_contribute.md b/step_by_step_contribute.md index 21d95140ce..22357b5672 100644 --- a/step_by_step_contribute.md +++ b/step_by_step_contribute.md @@ -30,7 +30,7 @@ git remote -v # Confirms that your remote makes sense > **Note:** > - > DM uses [`Go Modules`](https://github.com/golang/go/wiki/Modules) to manage dependencies. The version of Go should be **1.13** or above. + > DM uses [`Go Modules`](https://github.com/golang/go/wiki/Modules) to manage dependencies. The version of Go should be **1.16** or above. You'll need `GOPATH` defined, and `PATH` modified to access your Go binaries. A common setup is the following but you could always google a setup for your own diff --git a/tests/tiup/docker/control/Dockerfile b/tests/tiup/docker/control/Dockerfile index 2f181107e9..4259330abc 100644 --- a/tests/tiup/docker/control/Dockerfile +++ b/tests/tiup/docker/control/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13 +FROM golang:1.16 RUN apt-get -y -q update && \ apt-get -y -q install software-properties-common && \ diff --git a/tests/tiup/docker/node/Dockerfile b/tests/tiup/docker/node/Dockerfile index 687ec5fc91..afef0f4fe6 100644 --- a/tests/tiup/docker/node/Dockerfile +++ b/tests/tiup/docker/node/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13 +FROM golang:1.16 RUN apt-get update && \ apt-get -y install \ diff --git a/tools/go.mod b/tools/go.mod index d597b81966..0acb7e8e68 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/pingcap/dm/tools -go 1.13 +go 1.16 require ( github.com/gogo/protobuf v1.3.1