Skip to content

Commit

Permalink
Merge pull request #1701 from atc0005/i1700-update-golangci-lint-to-v…
Browse files Browse the repository at this point in the history
…1.60.2

Update golangci-lint to v1.60.2
  • Loading branch information
atc0005 authored Aug 22, 2024
2 parents 614b583 + e461db2 commit 0bf716b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Unless indicated otherwise, the following linting tools are included in the
| 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` |
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.60.2` |
| [`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` |
| [`pelletier/go-toml`](https://github.com/pelletier/go-toml) | `v2.2.2` |
Expand Down
4 changes: 2 additions & 2 deletions oldstable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1"
ENV GOLANGCI_LINT_VERSION="v1.60.2"
ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.24.0"
ENV GOVULNCHECK_VERSION="v1.1.3"
Expand Down Expand Up @@ -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.60.1"
ENV GOLANGCI_LINT_VERSION="v1.60.2"
ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.24.0"
ENV GOVULNCHECK_VERSION="v1.1.3"
Expand Down
4 changes: 2 additions & 2 deletions stable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ENV GOTOOLCHAIN="local"
# ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"

# Latest upstream
ENV GOLANGCI_LINT_VERSION="v1.60.1"
ENV GOLANGCI_LINT_VERSION="v1.60.2"

ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.24.0"
Expand Down Expand Up @@ -139,7 +139,7 @@ ENV GOTOOLCHAIN="local"
# ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"

# Latest upstream
ENV GOLANGCI_LINT_VERSION="v1.60.1"
ENV GOLANGCI_LINT_VERSION="v1.60.2"

# ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"
ENV STATICCHECK_VERSION="v0.5.1"
Expand Down
4 changes: 2 additions & 2 deletions unstable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ENV GOTOOLCHAIN="local"
# ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"

# Latest upstream
ENV GOLANGCI_LINT_VERSION="v1.60.1"
ENV GOLANGCI_LINT_VERSION="v1.60.2"

# 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.
Expand Down Expand Up @@ -139,7 +139,7 @@ ENV GOTOOLCHAIN="local"
# ENV GOLANGCI_LINT_VERSION="FORK-go1.23-support-2024-07-31"

# Latest upstream
ENV GOLANGCI_LINT_VERSION="v1.60.1"
ENV GOLANGCI_LINT_VERSION="v1.60.2"

# ENV STATICCHECK_VERSION="dec278f2f0d94b07c04db075d807e9f499f5d7b5"
ENV STATICCHECK_VERSION="v0.5.1"
Expand Down

0 comments on commit 0bf716b

Please sign in to comment.