From 07436fcaac0d18d68b6a0ff26358c8613d6125a9 Mon Sep 17 00:00:00 2001 From: releng Date: Wed, 28 Aug 2024 22:55:19 -0400 Subject: [PATCH] Sync from server repo (6b41662530b) --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 11eada7..572910a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ default: help +# Note: This file and siblings are under github.com/vertica/vcluster/ + ##@ General # The help target prints out all targets with their descriptions organized @@ -47,14 +49,13 @@ $(LOCALBIN): mkdir -p $(LOCALBIN) GOLANGCI_LINT = $(LOCALBIN)/golangci-lint -# Make sure that whenever changing this, you also change -# vertica/make/build-container/*Dockerfile -GOLANGCI_LINT_VER ?= 1.54.2 +# see [sandbox]/__golint_version__.txt +GOLANGCI_LINT_VERSION ?= 1.56.0 .PHONY: golangci-lint $(GOLANGCI_LINT) golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint $(GOLANGCI_LINT): $(LOCALBIN) -ifneq (${GOLANGCI_LINT_VER}, $(shell [ -f $(GOLANGCI_LINT) ] && $(GOLANGCI_LINT) version --format short 2>&1)) - @echo "golangci-lint missing or not version '${GOLANGCI_LINT_VER}', downloading..." - curl --retry 10 --retry-max-time 1800 -sSfL "https://raw.githubusercontent.com/golangci/golangci-lint/v${GOLANGCI_LINT_VER}/install.sh" | sh -s -- -b ./bin "v${GOLANGCI_LINT_VER}" +ifneq (${GOLANGCI_LINT_VERSION}, $(shell [ -f $(GOLANGCI_LINT) ] && $(GOLANGCI_LINT) version --format short 2>&1)) + @echo "golangci-lint missing or not version '${GOLANGCI_LINT_VERSION}', downloading..." + curl --retry 10 --retry-max-time 1800 -sSfL "https://raw.githubusercontent.com/golangci/golangci-lint/v${GOLANGCI_LINT_VERSION}/install.sh" | sh -s -- -b ./bin "v${GOLANGCI_LINT_VERSION}" endif