Fix golangci-lint install

Signed-off-by: Derek Nola <derek.nola@suse.com>
rancher · Aug 4, 2022 · 03f819c · 03f819c
1 parent 7036c6f
commit 03f819c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -44,7 +44,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
     chmod a+x /usr/local/bin/kubectl; \
     pip install codespell
 
-RUN curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.0
+RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.47.3
 RUN set -x \
     && apk --no-cache add \
     libarchive-tools \

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -34,7 +34,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
     )/bin/linux/${ARCH}/kubectl -o /usr/local/bin/kubectl && \
     chmod a+x /usr/local/bin/kubectl; \
     pip install codespell
-RUN curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.0
+RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.47.3
 WORKDIR /source
 # End Dapper stuff
 

diff --git a/scripts/validate b/scripts/validate
@@ -41,7 +41,10 @@ GO=${GO-go}
 echo Running validation
 
 echo Running: golangci-lint
-golangci-lint run -v
+# workaround for latest golanci-lint version, by default it always 
+# runs against latest version of go, which is not what we want.
+# https://github.com/golangci/golangci-lint/issues/2673
+golangci-lint run --version --verbose --out-format=github-actions
 
 echo Running: go fmt
 go fmt ./