From 5c41c8b1733b47a09adcced95adb4f2dd044fa8a Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Fri, 22 Nov 2019 20:36:51 +0530 Subject: [PATCH] Pin golangCI to a specific version (#13142) Automatic Merge --- .circleci/config.yml | 2 +- .golangci.yml | 3 +++ build/Jenkinsfile.pr | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04b56c4bdd..5cf8273697 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,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.21.0 + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.21.0 # Keep this in sync with .golangci.yml and Jenkinsfile.pr cd mattermost-server make config-reset make check-style BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}' diff --git a/.golangci.yml b/.golangci.yml index 7fe08ea5ec..51bd8e4aaa 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,3 +1,6 @@ +service: + golangci-lint-version: 1.21.0 # 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 b18a91cba9..137466434c 100644 --- a/build/Jenkinsfile.pr +++ b/build/Jenkinsfile.pr @@ -101,7 +101,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.21.0 + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.21.0 # Keep this in sync with .golangci.yml and .circleci/config.yml make config-reset make check-style BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}' make build BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}'