From b9c63cb35a8aac54db38d7155f809047ebd06331 Mon Sep 17 00:00:00 2001
From: Alessio <alex@playfulpachyderm.com>
Date: Sun, 15 Sep 2024 15:09:55 -0700
Subject: [PATCH] Move to newer version of golangci-lint

---
 .golangci.yaml                         | 8 ++------
 .woodpecker/docker/go-mingw.dockerfile | 2 +-
 .woodpecker/docker/go.dockerfile       | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index 030ae91..8882424 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -4,7 +4,7 @@
 # output configuration options
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions
-  format: colored-line-number
+  formats: colored-line-number
 
   # sorts results by: filepath, line and column
   sort-results: true
@@ -12,17 +12,14 @@ output:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - depguard
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - typecheck
     - unused
-    - varcheck
     - whitespace
     - wrapcheck
     - lll
@@ -321,7 +318,7 @@ linters-settings:
 
   govet:
     # report about shadowed variables
-    check-shadowing: true
+    # check-shadowing: true
 
     # settings per analyzer
     # settings:
@@ -335,7 +332,6 @@ linters-settings:
     enable-all: true
     # disable-all: false
     disable:
-      # - shadow
       - fieldalignment
       - composites
       - shadow
diff --git a/.woodpecker/docker/go-mingw.dockerfile b/.woodpecker/docker/go-mingw.dockerfile
index ddae4d9..8459009 100644
--- a/.woodpecker/docker/go-mingw.dockerfile
+++ b/.woodpecker/docker/go-mingw.dockerfile
@@ -5,7 +5,7 @@ from golang:1.21.4-alpine
 run apk add --no-cache git sqlite-libs sqlite-dev build-base mingw-w64-gcc curl vim grep
 
 # Install golangci-lint
-run curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/go/bin v1.53.1
+run curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/go/bin v1.59.1
 
 # Install project dependencies (so they don't have to be reinstalled on every CI run)
 run git clone https://gitlab.com/offline-twitter/twitter_offline_engine.git && cd twitter_offline_engine && go install ./... && cd .. && rm -r twitter_offline_engine
diff --git a/.woodpecker/docker/go.dockerfile b/.woodpecker/docker/go.dockerfile
index 9f66930..7315ba0 100644
--- a/.woodpecker/docker/go.dockerfile
+++ b/.woodpecker/docker/go.dockerfile
@@ -5,7 +5,7 @@ run apt update && apt install -y sudo curl wget build-essential sqlite3 jq git m
 # Install go and golangci-lint
 run wget https://go.dev/dl/go1.20.4.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.20.4.linux-amd64.tar.gz
 env PATH="$PATH:/usr/local/go/bin"
-run curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/go/bin v1.53.1
+run curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/go/bin v1.59.1
 
 # Install project dependencies (so they don't have to be reinstalled on every CI run)
 run git clone https://gitlab.com/offline-twitter/twitter_offline_engine.git && cd twitter_offline_engine && go install ./... && cd .. && rm -r twitter_offline_engine