From e461db216f40b4923da3d56d78645869cc9ab1b5 Mon Sep 17 00:00:00 2001 From: Adam Chalkley Date: Thu, 22 Aug 2024 06:22:54 -0500 Subject: [PATCH] Update golangci-lint to v1.60.2 - Update Dockerfile ENV values - Update README tools version table refs GH-1700 --- README.md | 2 +- oldstable/combined/Dockerfile | 4 ++-- stable/combined/Dockerfile | 4 ++-- unstable/combined/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a16bdda2..c93f3034 100644 --- a/README.md +++ b/README.md @@ -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` | diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile index 9526e88d..5223ae58 100644 --- 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.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" @@ -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" diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile index dd09fe8d..f5b40b52 100644 --- a/stable/combined/Dockerfile +++ b/stable/combined/Dockerfile @@ -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" @@ -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" diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile index f9b7621b..ddda2cf6 100644 --- a/unstable/combined/Dockerfile +++ b/unstable/combined/Dockerfile @@ -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. @@ -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"