From f42d3c83f30c78c73cb71015019187ad736841ac Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Mon, 16 Mar 2020 22:46:32 +0530 Subject: [PATCH] MM-22710: Bump golangci to 1.23.6 (#13948) * MM-22710: Bump golangci to 1.23.6 This is to prepare the codebase for 1.14 shift. 1.23.6 has some fixes which is necessary for a codebase using Go 1.14. * Remove golangci service The service is getting shut down. https://medium.com/golangci/golangci-com-is-closing-d1fc1bd30e0e * Remove unneeded comment Co-authored-by: mattermod --- .circleci/config.yml | 2 +- .golangci.yml | 3 --- build/Jenkinsfile.pr | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a16e0c4d67..a073ec9175 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - run: command: | echo "Installing golangci-lint" - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.3 # Keep this in sync with .golangci.yml and Jenkinsfile.pr + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.6 # Keep this in sync with Jenkinsfile.pr echo "Installing mattermost-govet" export GOBIN=${PWD}/mattermost-server/bin GO111MODULE=off go get -u github.com/mattermost/mattermost-govet diff --git a/.golangci.yml b/.golangci.yml index 9497854664..3310ed41cc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,3 @@ -service: - golangci-lint-version: 1.23.3 # Keep this in sync with .circleci/config.yml and Jenkinsfile.pr - run: timeout: 5m modules-download-mode: vendor diff --git a/build/Jenkinsfile.pr b/build/Jenkinsfile.pr index 7915a95527..ce62bc7f73 100644 --- a/build/Jenkinsfile.pr +++ b/build/Jenkinsfile.pr @@ -103,7 +103,7 @@ pipeline { sh """ cd /go/src/github.com/mattermost/mattermost-server echo "Installing golangci-lint" - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.3 # Keep this in sync with .golangci.yml and .circleci/config.yml + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.6 # Keep this in sync with .circleci/config.yml echo "Installing mattermost-govet" GO111MODULE=off go get -u github.com/mattermost/mattermost-govet export PATH=$PATH:$GOBIN