Skip to content

Commit 5a7883a

Browse files
authored
Merge pull request #1694 from atc0005/i1686-update-staticcheck-to-v0.5.1
Update staticcheck to v0.5.1
2 parents 6774f4e + a77d37b commit 5a7883a

File tree

4 files changed

+17
-20
lines changed

4 files changed

+17
-20
lines changed

README.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,17 @@ others.
7272
Unless indicated otherwise, the following linting tools are included in the
7373
`go-ci-stable`, `go-ci-oldstable` and `go-ci-unstable` images:
7474

75-
| Linter | Version |
76-
| --------------------------------------------------------------------- | ------------------------------------------------------- |
77-
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2023.1.7` (`v0.4.7`) (`stable` and `oldstable` images) |
78-
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2024.1rc1` (`v0.5.0-rc.1`) (`unstable` image) |
79-
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.60.1` |
80-
| [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.3` |
81-
| [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode) | `v0.24.0` |
82-
| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` (`oldstable` image) |
83-
| [`orijtech/structslop`](https://github.com/orijtech/structslop) | `v0.0.8` (`oldstable` image) |
84-
| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer) | `v0.0.3` (`oldstable` image) |
85-
| [`pelletier/go-toml`](https://github.com/pelletier/go-toml) | `v2.2.2` |
86-
| [`fatih/errwrap`](https://github.com/fatih/errwrap) | `v1.6.0` |
75+
| Linter | Version |
76+
| --------------------------------------------------------------------- | ---------------------------- |
77+
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2024.1.1` (`v0.5.1`) |
78+
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.60.1` |
79+
| [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.3` |
80+
| [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode) | `v0.24.0` |
81+
| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` (`oldstable` image) |
82+
| [`orijtech/structslop`](https://github.com/orijtech/structslop) | `v0.0.8` (`oldstable` image) |
83+
| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer) | `v0.0.3` (`oldstable` image) |
84+
| [`pelletier/go-toml`](https://github.com/pelletier/go-toml) | `v2.2.2` |
85+
| [`fatih/errwrap`](https://github.com/fatih/errwrap) | `v1.6.0` |
8786

8887
Forks:
8988

oldstable/combined/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FROM amd64/golang:1.22.6-bookworm as builder
1616
ENV GOTOOLCHAIN="local"
1717

1818
ENV GOLANGCI_LINT_VERSION="v1.60.1"
19-
ENV STATICCHECK_VERSION="v0.4.7"
19+
ENV STATICCHECK_VERSION="v0.5.1"
2020
ENV DEADCODE_VERSION="v0.24.0"
2121
ENV GOVULNCHECK_VERSION="v1.1.3"
2222
# ENV HTTPERRORYZER_VERSION="v0.0.1"
@@ -129,7 +129,7 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
129129
ENV GOTOOLCHAIN="local"
130130

131131
ENV GOLANGCI_LINT_VERSION="v1.60.1"
132-
ENV STATICCHECK_VERSION="v0.4.7"
132+
ENV STATICCHECK_VERSION="v0.5.1"
133133
ENV DEADCODE_VERSION="v0.24.0"
134134
ENV GOVULNCHECK_VERSION="v1.1.3"
135135
ENV TOMLL_VERSION="v2.2.2"

stable/combined/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FROM amd64/golang:1.23.0-bookworm as builder
1616
ENV GOTOOLCHAIN="local"
1717

1818
ENV GOLANGCI_LINT_VERSION="v1.60.1"
19-
ENV STATICCHECK_VERSION="v0.4.7"
19+
ENV STATICCHECK_VERSION="v0.5.1"
2020
ENV DEADCODE_VERSION="v0.24.0"
2121
ENV GOVULNCHECK_VERSION="v1.1.3"
2222
# ENV HTTPERRORYZER_VERSION="v0.0.1"
@@ -135,7 +135,7 @@ ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
135135
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
136136

137137
ENV GOLANGCI_LINT_VERSION="v1.60.1"
138-
ENV STATICCHECK_VERSION="v0.4.7"
138+
ENV STATICCHECK_VERSION="v0.5.1"
139139
ENV DEADCODE_VERSION="v0.24.0"
140140
ENV GOVULNCHECK_VERSION="v1.1.3"
141141
# ENV HTTPERRORYZER_VERSION="v0.0.1"

unstable/combined/Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ ENV GOLANGCI_LINT_VERSION="v1.60.1"
2525

2626
# A current master branch build is used for pre-release Go versions, otherwise
2727
# the latest upstream build of the tool is installed in this image.
28-
# ENV STATICCHECK_VERSION="v0.4.7"
2928
# ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"
30-
ENV STATICCHECK_VERSION="v0.5.0-rc.1"
29+
ENV STATICCHECK_VERSION="v0.5.1"
3130

3231
ENV DEADCODE_VERSION="v0.24.0"
3332
ENV GOVULNCHECK_VERSION="v1.1.3"
@@ -145,9 +144,8 @@ ENV GOTOOLCHAIN="local"
145144
# Latest upstream
146145
ENV GOLANGCI_LINT_VERSION="v1.60.1"
147146

148-
# ENV STATICCHECK_VERSION="v0.4.7"
149147
# ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"
150-
ENV STATICCHECK_VERSION="v0.5.0-rc.1"
148+
ENV STATICCHECK_VERSION="v0.5.1"
151149

152150
# These commits/versions are provided by temporary forks of the upstream
153151
# projects. The plan is to switch back to current upstream vesions once

0 commit comments

Comments
 (0)