From 581900062e0cbb42edecd4524ecbe95d447aff04 Mon Sep 17 00:00:00 2001
From: David Bariod <dbariod@scaleway.com>
Date: Fri, 6 Nov 2020 13:26:15 +0100
Subject: [PATCH] bump golangci-lint version

---
 .travis.yml       |  4 ++--
 travis/install.sh | 11 +++--------
 travis/lint.sh    |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b941b17..996f57a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,8 @@ git:
   depth: 1
 env:
   - GO111MODULE=on
-go: [1.14.x, 1.15.x]
-os: [linux, osx]
+go: 1.15.x
+os: linux
 install:
   - ./travis/install.sh
 script:
diff --git a/travis/install.sh b/travis/install.sh
index 5fc40dd..8cbd0d7 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -2,9 +2,9 @@
 
 set -e
 
-# Install golanci 1.21.0
-if [[ "$TRAVIS_GO_VERSION" =~ ^1\.13\. ]]; then
-    curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.21.0
+# Install golanci 1.32.2
+if [[ "$TRAVIS_GO_VERSION" =~ ^1\.15\. ]]; then
+    curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.32.2
 fi
 
 # Only do this for go1.12 when modules are on so that it doesn't need to be done when modules are off as well.
@@ -15,8 +15,3 @@ fi
 if [[ "$GO111MODULE" ==  "on" ]]; then
     go mod download
 fi
-
-if [[ "$GO111MODULE" == "off" ]]; then
-    # Should contain all regular (not indirect) modules from go.mod
-    go get github.com/stretchr/testify golang.org/x/sys/unix golang.org/x/sys/windows
-fi
diff --git a/travis/lint.sh b/travis/lint.sh
index c0a42df..98fb5bb 100755
--- a/travis/lint.sh
+++ b/travis/lint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ "$TRAVIS_GO_VERSION" =~ ^1\.13\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GO111MODULE" == "on" ]]; then
+if [[ "$TRAVIS_GO_VERSION" =~ ^1\.15\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GO111MODULE" == "on" ]]; then
     $(go env GOPATH)/bin/golangci-lint run ./...
 else
     echo "linter has not been run"