Skip to content

Commit 6deb3ff

Browse files
authored
Update golangci-lint, yamllint, hadolint to latest versions (tinkerbell#47)
In particular, the newer golangci-lint checks work better with go v1.18.
2 parents 1fbf2d2 + 9610666 commit 6deb3ff

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ FIXERS += shellcheck-fix
4040
shellcheck-fix: $(SHELLCHECK_BIN)
4141
$(SHELLCHECK_BIN) $(shell find . -name "*.sh") -f diff | { read -t 1 line || exit 0; { echo "$$line" && cat; } | git apply -p2; }
4242

43-
HADOLINT_VERSION ?= v2.8.0
43+
HADOLINT_VERSION ?= v2.10.0
4444
HADOLINT_BIN := $(LINT_ROOT)/out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
4545
$(HADOLINT_BIN):
4646
mkdir -p $(LINT_ROOT)/out/linters
@@ -54,7 +54,7 @@ hadolint-lint: $(HADOLINT_BIN)
5454
$(HADOLINT_BIN) $(shell find . -name "*Dockerfile")
5555

5656
GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
57-
GOLANGCI_LINT_VERSION ?= v1.43.0
57+
GOLANGCI_LINT_VERSION ?= v1.47.2
5858
GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
5959
$(GOLANGCI_LINT_BIN):
6060
mkdir -p $(LINT_ROOT)/out/linters
@@ -70,7 +70,7 @@ FIXERS += golangci-lint-fix
7070
golangci-lint-fix: $(GOLANGCI_LINT_BIN)
7171
find . -name go.mod -execdir "$(GOLANGCI_LINT_BIN)" run -c "$(GOLANGCI_LINT_CONFIG)" --fix \;
7272

73-
YAMLLINT_VERSION ?= 1.26.3
73+
YAMLLINT_VERSION ?= 1.27.1
7474
YAMLLINT_ROOT := $(LINT_ROOT)/out/linters/yamllint-$(YAMLLINT_VERSION)
7575
YAMLLINT_BIN := $(YAMLLINT_ROOT)/dist/bin/yamllint
7676
$(YAMLLINT_BIN):

Makefile.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ shellcheck-fix: $(SHELLCHECK_BIN)
4444
{{ end -}}
4545

4646
{{ if .Dockerfile -}}
47-
HADOLINT_VERSION ?= v2.8.0
47+
HADOLINT_VERSION ?= v2.10.0
4848
HADOLINT_BIN := $(LINT_ROOT)/out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
4949
$(HADOLINT_BIN):
5050
mkdir -p $(LINT_ROOT)/out/linters
@@ -61,7 +61,7 @@ hadolint-lint: $(HADOLINT_BIN)
6161

6262
{{ if .Go -}}
6363
GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
64-
GOLANGCI_LINT_VERSION ?= v1.43.0
64+
GOLANGCI_LINT_VERSION ?= v1.47.2
6565
GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
6666
$(GOLANGCI_LINT_BIN):
6767
mkdir -p $(LINT_ROOT)/out/linters
@@ -80,7 +80,7 @@ golangci-lint-fix: $(GOLANGCI_LINT_BIN)
8080
{{ end -}}
8181

8282
{{ if .YAML -}}
83-
YAMLLINT_VERSION ?= 1.26.3
83+
YAMLLINT_VERSION ?= 1.27.1
8484
YAMLLINT_ROOT := $(LINT_ROOT)/out/linters/yamllint-$(YAMLLINT_VERSION)
8585
YAMLLINT_BIN := $(YAMLLINT_ROOT)/dist/bin/yamllint
8686
$(YAMLLINT_BIN):

0 commit comments

Comments
 (0)