From 2dad1a965e618b07293d12aaf9958bda8af03ab9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 13 Feb 2025 13:14:54 -0800 Subject: [PATCH] Makefile: Move to golangci-lint v1.60 Version 1.56 pulls in 1.22.0 which is too low for our go.mod version of 1.22.6 and v1.59 pulls in go v1.22.5 So move to 1.60 which pulls in 1.23, which should work fine after some new linting complaints are addressed. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 181dad46a..aea6a5ffe 100644 --- a/Makefile +++ b/Makefile @@ -23,11 +23,13 @@ RST2MAN ?= rst2man SHELL := /bin/bash .SHELLFLAGS := -ec -o pipefail -# see https://hub.docker.com/r/docker/golangci-lint/tags -# v1.56 to get golang 1.22 (1.22.1) +# see https://hub.docker.com/r/golangci/golangci-lint/tags +# This is also used in Containerfile_golangci_lint FROM line +# v1.60 to get golang 1.23 (1.23.0) +# v1.56 to get golang 1.22 (1.22.0) # v1.55 to get golang 1.21 (1.21.3) # v1.53 to get golang 1.20 (1.20.5) -GOLANGCI_LINT_VERSION=v1.56 +GOLANGCI_LINT_VERSION=v1.60 GOLANGCI_LINT_CACHE_DIR=$(HOME)/.cache/golangci-lint/$(GOLANGCI_LINT_VERSION) GOLANGCI_COMPOSER_IMAGE=composer_golangci #