Merge pull request #1693 from atc0005/i1683-update-golangci-lint-to-v…

…1.60.1 Update golangci-lint to v1.60.1
atc0005 · Aug 15, 2024 · 77ff599 · 77ff599
2 parents d054911 + d4516f5
commit 77ff599
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Unless indicated otherwise, the following linting tools are included in the
 | --------------------------------------------------------------------- | ------------------------------------------------------- |
 | [`staticcheck`](https://github.com/dominikh/go-tools)                 | `2023.1.7` (`v0.4.7`) (`stable` and `oldstable` images) |
 | [`staticcheck`](https://github.com/dominikh/go-tools)                 | `2024.1rc1` (`v0.5.0-rc.1`) (`unstable` image)          |
-| [`golangci-lint`](https://github.com/golangci/golangci-lint)          | `v1.59.1` (`stable` and `oldstable` images)             |
+| [`golangci-lint`](https://github.com/golangci/golangci-lint)          | `v1.60.1`                                               |
 | [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.3`                                                |
 | [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode)      | `v0.24.0`                                               |
 | [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` (`oldstable` image)                            |

diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile
@@ -15,7 +15,7 @@ FROM amd64/golang:1.22.6-bookworm as builder
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-ENV GOLANGCI_LINT_VERSION="v1.59.1"
+ENV GOLANGCI_LINT_VERSION="v1.60.1"
 ENV STATICCHECK_VERSION="v0.4.7"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
@@ -128,7 +128,7 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-ENV GOLANGCI_LINT_VERSION="v1.59.1"
+ENV GOLANGCI_LINT_VERSION="v1.60.1"
 ENV STATICCHECK_VERSION="v0.4.7"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"

diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile
@@ -15,7 +15,7 @@ FROM amd64/golang:1.23.0-bookworm as builder
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-ENV GOLANGCI_LINT_VERSION="v1.59.1"
+ENV GOLANGCI_LINT_VERSION="v1.60.1"
 ENV STATICCHECK_VERSION="v0.4.7"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
@@ -134,7 +134,7 @@ ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
 ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
-ENV GOLANGCI_LINT_VERSION="v1.59.1"
+ENV GOLANGCI_LINT_VERSION="v1.60.1"
 ENV STATICCHECK_VERSION="v0.4.7"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"

diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile
@@ -18,8 +18,10 @@ ENV GOTOOLCHAIN="local"
 # A current dev branch build (mirrored to fork) is used for pre-release Go
 # versions, otherwise the latest upstream build of the tool is installed in
 # this image.
-# ENV GOLANGCI_LINT_VERSION="v1.59.1"
-ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"
+# ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"
+
+# Latest upstream
+ENV GOLANGCI_LINT_VERSION="v1.60.1"
 
 # A current master branch build is used for pre-release Go versions, otherwise
 # the latest upstream build of the tool is installed in this image.
@@ -102,19 +104,19 @@ RUN echo "Installing errwrap@${ERRWRAP_VERSION}" \
 #     && go install . \
 #     && cd ..
 
-RUN echo "Installing golangci-lint from dev feat/go1.23 branch" \
-    && git clone https://github.com/atc0005/golangci-lint \
-    && cd golangci-lint \
-    && git checkout ${GOLANGCI_LINT_VERSION} \
-    && go install ./cmd/golangci-lint \
-    && golangci-lint --version
-
-# RUN echo "Installing golangci-lint@${GOLANGCI_LINT_VERSION}" \
-#     && echo "Installing golangci-lint ${GOLANGCI_LINT_VERSION}" \
-#     && curl -sSfLO https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
-#     && sh install.sh -b "$(go env GOPATH)/bin" ${GOLANGCI_LINT_VERSION} \
+# RUN echo "Installing golangci-lint from dev feat/go1.23 branch" \
+#     && git clone https://github.com/atc0005/golangci-lint \
+#     && cd golangci-lint \
+#     && git checkout ${GOLANGCI_LINT_VERSION} \
+#     && go install ./cmd/golangci-lint \
 #     && golangci-lint --version
 
+RUN echo "Installing golangci-lint@${GOLANGCI_LINT_VERSION}" \
+    && echo "Installing golangci-lint ${GOLANGCI_LINT_VERSION}" \
+    && curl -sSfLO https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
+    && sh install.sh -b "$(go env GOPATH)/bin" ${GOLANGCI_LINT_VERSION} \
+    && golangci-lint --version
+
 FROM amd64/golang:1.23-bookworm as final
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
@@ -138,8 +140,10 @@ ENV GOTOOLCHAIN="local"
 # A current dev branch build (mirrored to fork) is used for pre-release Go
 # versions, otherwise the latest upstream build of the tool is installed in
 # this image.
-# ENV GOLANGCI_LINT_VERSION="v1.59.1"
-ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"
+# ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"
+
+# Latest upstream
+ENV GOLANGCI_LINT_VERSION="v1.60.1"
 
 # ENV STATICCHECK_VERSION="v0.4.7"
 # ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"