Group per file definitions together

Its easier to reason about things if they are all close to each other. Now
that lint and fix are at the bottom of the file there is no need to split
up definitions.

Signed-off-by: Manuel Mendez <[email protected]>

Author: mmlb

Makefile

@@ -5,10 +5,6 @@
 .PHONY: lint
 lint: _lint
 
-GOLINT_VERSION ?= v1.42.1
-HADOLINT_VERSION ?= v2.7.0
-SHELLCHECK_VERSION ?= v0.7.2
-YAMLLINT_VERSION ?= 1.26.3
 LINT_ARCH := $(shell uname -m)
 LINT_OS := $(shell uname)
 LINT_OS_LOWER := $(shell echo $(LINT_OS) | tr '[:upper:]' '[:lower:]')
@@ -21,27 +17,31 @@ ifeq ($(LINT_OS),Darwin)
 	endif
 endif
 
-GOLINT_CONFIG = $(LINT_ROOT)/.golangci.yml
-YAMLLINT_ROOT = out/linters/yamllint-$(YAMLLINT_VERSION)
 
+SHELLCHECK_VERSION ?= v0.7.2
 out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:
 	mkdir -p out/linters
 	rm -rf out/linters/shellcheck-*
 	curl -sSfL https://github.com/koalaman/shellcheck/releases/download/$(SHELLCHECK_VERSION)/shellcheck-$(SHELLCHECK_VERSION).$(LINT_OS_LOWER).$(LINT_ARCH).tar.xz | tar -C out/linters -xJf -
 	mv out/linters/shellcheck-$(SHELLCHECK_VERSION) out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
 
+HADOLINT_VERSION ?= v2.7.0
 out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH):
 	mkdir -p out/linters
 	rm -rf out/linters/hadolint-*
 	curl -sfL https://github.com/hadolint/hadolint/releases/download/v2.6.1/hadolint-$(LINT_OS)-$(LINT_ARCH) > out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
 	chmod u+x out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
 
+GOLINT_CONFIG = $(LINT_ROOT)/.golangci.yml
+GOLINT_VERSION ?= v1.42.1
 out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
 	mkdir -p out/linters
 	rm -rf out/linters/golangci-lint-*
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b out/linters $(GOLINT_VERSION)
 	mv out/linters/golangci-lint out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH)
 
+YAMLLINT_VERSION ?= 1.26.3
+YAMLLINT_ROOT = out/linters/yamllint-$(YAMLLINT_VERSION)
 $(YAMLLINT_ROOT)/dist/bin/yamllint:
 	mkdir -p out/linters
 	rm -rf out/linters/yamllint-*

Makefile.tmpl

@@ -5,10 +5,6 @@
 .PHONY: lint
 lint: _lint
 
-{{ if .Go }}GOLINT_VERSION ?= v1.42.1{{ end }}
-{{ if .Dockerfile}}HADOLINT_VERSION ?= v2.7.0{{ end }}
-{{ if .Shell}}SHELLCHECK_VERSION ?= v0.7.2{{ end }}
-{{ if .YAML}}YAMLLINT_VERSION ?= 1.26.3{{ end }}
 LINT_ARCH := $(shell uname -m)
 LINT_OS := $(shell uname)
 LINT_OS_LOWER := $(shell echo $(LINT_OS) | tr '[:upper:]' '[:lower:]')
@@ -21,10 +17,9 @@ ifeq ($(LINT_OS),Darwin)
 	endif
 endif
 
-{{ if .Go }}GOLINT_CONFIG = $(LINT_ROOT)/.golangci.yml{{ end }}
-{{ if .YAML }}YAMLLINT_ROOT = out/linters/yamllint-$(YAMLLINT_VERSION){{ end }}
 
 {{ if .Shell -}}
+SHELLCHECK_VERSION ?= v0.7.2
 out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:
 	mkdir -p out/linters
 	rm -rf out/linters/shellcheck-*
@@ -33,6 +28,7 @@ out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:
 
 {{ end -}}
 {{ if .Dockerfile -}}
+HADOLINT_VERSION ?= v2.7.0
 out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH):
 	mkdir -p out/linters
 	rm -rf out/linters/hadolint-*
@@ -41,6 +37,8 @@ out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH):
 
 {{ end -}}
 {{ if .Go -}}
+GOLINT_CONFIG = $(LINT_ROOT)/.golangci.yml
+GOLINT_VERSION ?= v1.42.1
 out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
 	mkdir -p out/linters
 	rm -rf out/linters/golangci-lint-*
@@ -50,6 +48,8 @@ out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
 {{ end -}}
 
 {{ if .YAML -}}
+YAMLLINT_VERSION ?= 1.26.3
+YAMLLINT_ROOT = out/linters/yamllint-$(YAMLLINT_VERSION)
 $(YAMLLINT_ROOT)/dist/bin/yamllint:
 	mkdir -p out/linters
 	rm -rf out/linters/yamllint-*