Merge pull request #1694 from atc0005/i1686-update-staticcheck-to-v0.5.1

Update staticcheck to v0.5.1
atc0005 · Aug 15, 2024 · 5a7883a · 5a7883a
2 parents 6774f4e + a77d37b
commit 5a7883a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -72,18 +72,17 @@ others.
 Unless indicated otherwise, the following linting tools are included in the
 `go-ci-stable`, `go-ci-oldstable` and `go-ci-unstable` images:
 
-| Linter                                                                | Version                                                 |
-| --------------------------------------------------------------------- | ------------------------------------------------------- |
-| [`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.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)                            |
-| [`orijtech/structslop`](https://github.com/orijtech/structslop)       | `v0.0.8` (`oldstable` image)                            |
-| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer)       | `v0.0.3` (`oldstable` image)                            |
-| [`pelletier/go-toml`](https://github.com/pelletier/go-toml)           | `v2.2.2`                                                |
-| [`fatih/errwrap`](https://github.com/fatih/errwrap)                   | `v1.6.0`                                                |
+| Linter                                                                | Version                      |
+| --------------------------------------------------------------------- | ---------------------------- |
+| [`staticcheck`](https://github.com/dominikh/go-tools)                 | `2024.1.1` (`v0.5.1`)        |
+| [`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) |
+| [`orijtech/structslop`](https://github.com/orijtech/structslop)       | `v0.0.8` (`oldstable` image) |
+| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer)       | `v0.0.3` (`oldstable` image) |
+| [`pelletier/go-toml`](https://github.com/pelletier/go-toml)           | `v2.2.2`                     |
+| [`fatih/errwrap`](https://github.com/fatih/errwrap)                   | `v1.6.0`                     |
 
 Forks:
 

diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile
@@ -16,7 +16,7 @@ FROM amd64/golang:1.22.6-bookworm as builder
 ENV GOTOOLCHAIN="local"
 
 ENV GOLANGCI_LINT_VERSION="v1.60.1"
-ENV STATICCHECK_VERSION="v0.4.7"
+ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
@@ -129,7 +129,7 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 ENV GOTOOLCHAIN="local"
 
 ENV GOLANGCI_LINT_VERSION="v1.60.1"
-ENV STATICCHECK_VERSION="v0.4.7"
+ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
 ENV TOMLL_VERSION="v2.2.2"

diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile
@@ -16,7 +16,7 @@ FROM amd64/golang:1.23.0-bookworm as builder
 ENV GOTOOLCHAIN="local"
 
 ENV GOLANGCI_LINT_VERSION="v1.60.1"
-ENV STATICCHECK_VERSION="v0.4.7"
+ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
@@ -135,7 +135,7 @@ ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 ENV GOLANGCI_LINT_VERSION="v1.60.1"
-ENV STATICCHECK_VERSION="v0.4.7"
+ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"

diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile
@@ -25,9 +25,8 @@ 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.
-# ENV STATICCHECK_VERSION="v0.4.7"
 # ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"
-ENV STATICCHECK_VERSION="v0.5.0-rc.1"
+ENV STATICCHECK_VERSION="v0.5.1"
 
 ENV DEADCODE_VERSION="v0.24.0"
 ENV GOVULNCHECK_VERSION="v1.1.3"
@@ -145,9 +144,8 @@ ENV GOTOOLCHAIN="local"
 # Latest upstream
 ENV GOLANGCI_LINT_VERSION="v1.60.1"
 
-# ENV STATICCHECK_VERSION="v0.4.7"
 # ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"
-ENV STATICCHECK_VERSION="v0.5.0-rc.1"
+ENV STATICCHECK_VERSION="v0.5.1"
 
 # These commits/versions are provided by temporary forks of the upstream
 # projects. The plan is to switch back to current upstream vesions once