From 96b49f14f55ff1687985261a9485be4eefbf9e1e Mon Sep 17 00:00:00 2001 From: "edward.zeng" Date: Thu, 27 Jan 2022 15:57:40 +0800 Subject: [PATCH] Upgrade golang from 1.15.2 to 1.16.9 (#11393) Signed-off-by: Edward Zeng --- .golangci.yml | 2 ++ build/docker/builder/cpu/centos7/Dockerfile | 2 +- build/docker/builder/cpu/ubuntu18.04/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 28d085859c..fba5c92e7c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -44,6 +44,8 @@ issues: - G307 # Use of weak random number generator math/rand - G404 + # Exclude copylocks + - copylocks # Maximum issues count per one linter. Set to 0 to disable. Default is 50. max-issues-per-linter: 0 # Maximum count of issues with the same text. Set to 0 to disable. Default is 3. diff --git a/build/docker/builder/cpu/centos7/Dockerfile b/build/docker/builder/cpu/centos7/Dockerfile index c66c368f99..9f6b9097c4 100644 --- a/build/docker/builder/cpu/centos7/Dockerfile +++ b/build/docker/builder/cpu/centos7/Dockerfile @@ -46,7 +46,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://golang.org/dl/go1.15.2.linux-amd64.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://golang.org/dl/go1.16.9.linux-amd64.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOPATH}/bin v1.43.0 && \ export GO111MODULE=on && go get github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.2.1 && \ diff --git a/build/docker/builder/cpu/ubuntu18.04/Dockerfile b/build/docker/builder/cpu/ubuntu18.04/Dockerfile index a9953508bc..746d68d6ee 100644 --- a/build/docker/builder/cpu/ubuntu18.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu18.04/Dockerfile @@ -23,7 +23,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://golang.org/dl/go1.15.2.linux-amd64.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://golang.org/dl/go1.16.9.linux-amd64.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOPATH}/bin v1.43.0 && \ export GO111MODULE=on && go get github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.2.1 && \