Skip to content

Commit 92abf2f

Browse files
authored
golangci: bring back the unused linter (#13826)
golangci/golangci-lint#885 is fixed wth 1.23.3. We can now bring back unused.
1 parent 935bfa4 commit 92abf2f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- run:
6868
command: |
6969
echo "Installing golangci-lint"
70-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.0 # Keep this in sync with .golangci.yml and Jenkinsfile.pr
70+
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
7171
echo "Installing mattermost-govet"
7272
export GOBIN=${PWD}/mattermost-server/bin
7373
GO111MODULE=off go get -u github.com/mattermost/mattermost-govet

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
service:
2-
golangci-lint-version: 1.23.0 # Keep this in sync with .circleci/config.yml and Jenkinsfile.pr
2+
golangci-lint-version: 1.23.3 # Keep this in sync with .circleci/config.yml and Jenkinsfile.pr
33

44
run:
55
timeout: 5m
@@ -25,7 +25,7 @@ linters:
2525
- ineffassign
2626
- structcheck
2727
- unconvert
28-
# - unused Disable until https://github.com/golangci/golangci-lint/issues/885 is fixed
28+
- unused
2929
- varcheck
3030
# TODO: enable this later
3131
# - errcheck

build/Jenkinsfile.pr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pipeline {
103103
sh """
104104
cd /go/src/github.com/mattermost/mattermost-server
105105
echo "Installing golangci-lint"
106-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.0 # Keep this in sync with .golangci.yml and .circleci/config.yml
106+
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
107107
echo "Installing mattermost-govet"
108108
GO111MODULE=off go get -u github.com/mattermost/mattermost-govet
109109
export PATH=$PATH:$GOBIN

0 commit comments

Comments
 (0)