Improve multi-arch handling within the same git checkout

Signed-off-by: Thomas Stromberg <[email protected]>

Author: tstromberg

Makefile.tmpl

@@ -3,12 +3,12 @@
 # http://github.com/tinkerbell/lint-install
 
 {{ if .Go }}GOLINT_VERSION ?= v1.42.0{{ end }}
-{{ if .Dockerfile}}HADOLINT_VERSION ?= v2.7.0{{ end }}
-{{ if .Shell}}SHELLCHECK_VERSION ?= v0.7.2{{ end }}
+{{- if .Dockerfile}}HADOLINT_VERSION ?= v2.7.0{{ end }}
+{{- if .Shell}}SHELLCHECK_VERSION ?= v0.7.2{{ end }}
 LINT_OS := $(shell uname)
 LINT_ARCH := $(shell uname -m)
 
-# shellcheck and hadolint don't have arm64 native binaries: use Rosetta instead
+# shellcheck and hadolint lack arm64 native binaries: rely on x86-64 emulation
 ifeq ($(LINT_OS),Darwin)
 	ifeq ($(LINT_ARCH),arm64)
 		LINT_ARCH=x86_64
@@ -18,25 +18,29 @@ endif
 {{ if .Shell }}LINT_LOWER_OS  = $(shell echo $(LINT_OS) | tr '[:upper:]' '[:lower:]'){{ end }}
 {{ if .Go }}GOLINT_CONFIG:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))/.golangci.yml{{ end }}
 
-lint: {{ if .Shell }}out/linters/shellcheck-$(SHELLCHECK_VERSION)/shellcheck {{ end }}{{ if .Dockerfile }}out/linters/hadolint-$(HADOLINT_VERSION) {{ end }}{{ if .Go}}out/linters/golangci-lint-$(GOLINT_VERSION){{ end }}
+lint: {{ if .Shell }}out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck {{ end }}{{ if .Dockerfile }}out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) {{ end }}{{ if .Go}}out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH){{ end }}
 	{{- range .Commands }}
 	{{ .}}{{ end}}
-{{ if .Shell}}
-out/linters/shellcheck-$(SHELLCHECK_VERSION)/shellcheck:
+
+{{ if .Shell -}}
+out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:
 	mkdir -p out/linters
-	curl -sfL https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-$(SHELLCHECK_VERSION).$(LINT_LOWER_OS).$(LINT_ARCH).tar.xz | tar -C out/linters -xJf -
-{{- end }}
-{{ if .Dockerfile}}
-out/linters/hadolint-$(HADOLINT_VERSION):
+	curl -sSfL https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-$(SHELLCHECK_VERSION).$(LINT_LOWER_OS).$(LINT_ARCH).tar.xz | tar -C out/linters -xJf -
+	mv shellcheck-$(SHELLCHECK_VERSION) shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
+
+{{ end -}}
+{{ if .Dockerfile -}}
+out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH):
 	mkdir -p out/linters
-	curl -sfL https://github.com/hadolint/hadolint/releases/download/v2.6.1/hadolint-$(LINT_OS)-$(LINT_ARCH) > out/linters/hadolint-$(HADOLINT_VERSION)
-	chmod u+x out/linters/hadolint-$(HADOLINT_VERSION)
-{{- end }}
-{{ if .Go }}
-out/linters/golangci-lint-$(GOLINT_VERSION):
+	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)
+
+{{ end -}}
+{{ if .Go -}}
+out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
 	mkdir -p out/linters
-	curl -sfL 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)
-{{- end }}
+	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)
 
+{{ end -}}
 # END: lint-install {{.Args}}

lint-install.go

@@ -187,7 +187,7 @@ func goLintCmd(root string, level string) string {
 	}
 
 	if len(found) == 1 && found[0] == root {
-		return fmt.Sprintf("out/linters/golangci-lint-$(GOLINT_VERSION) run%s", suffix)
+		return fmt.Sprintf("out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) run%s", suffix)
 	}
 
 	return fmt.Sprintf(`find . -name go.mod | xargs -n1 dirname | xargs -n1 -I{} sh -c "cd {} && golangci-lint run -c $(GOLINT_CONFIG)"%s`, suffix)
@@ -199,7 +199,7 @@ func shellLintCmd(_ string, level string) string {
 	if level == "warn" {
 		suffix = " || true"
 	}
-	return fmt.Sprintf(`out/linters/shellcheck-$(SHELLCHECK_VERSION)/shellcheck $(shell find . -name "*.sh")%s`, suffix)
+	return fmt.Sprintf(`out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck $(shell find . -name "*.sh")%s`, suffix)
 }
 
 // dockerLintCmd returns the appropriate docker lint command for a project.
@@ -208,7 +208,7 @@ func dockerLintCmd(_ string, level string) string {
 	if level == "warn" {
 		threshold = "none"
 	}
-	return fmt.Sprintf(`out/linters/hadolint-$(HADOLINT_VERSION) -t %s $(shell find . -name "*Dockerfile")`, threshold)
+	return fmt.Sprintf(`out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) -t %s $(shell find . -name "*Dockerfile")`, threshold)
 }
 
 // main creates peanut butter & jelly sandwiches with utmost precision.