Skip to content

Commit f37e927

Browse files
Thomas StrombergThomas Stromberg
authored andcommitted
upgrade linters
1 parent 260d775 commit f37e927

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ linters:
186186
arguments: [10]
187187
- name: flag-parameter # fixes are difficult
188188
disabled: true
189+
- name: bare-return
190+
disabled: true
189191

190192
rowserrcheck:
191193
# database/sql is always checked.

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ endif
2525
LINTERS :=
2626
FIXERS :=
2727

28-
SHELLCHECK_VERSION ?= v0.10.0
28+
SHELLCHECK_VERSION ?= v0.11.0
2929
SHELLCHECK_BIN := $(LINT_ROOT)/out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
3030
$(SHELLCHECK_BIN):
3131
mkdir -p $(LINT_ROOT)/out/linters
@@ -45,7 +45,7 @@ FIXERS += shellcheck-fix
4545
shellcheck-fix: $(SHELLCHECK_BIN)
4646
$(SHELLCHECK_BIN) $(shell find . -name "*.sh") -f diff | { read -t 1 line || exit 0; { echo "$$line" && cat; } | git apply -p2; }
4747

48-
HADOLINT_VERSION ?= v2.12.1-beta
48+
HADOLINT_VERSION ?= v2.14.0
4949
HADOLINT_BIN := $(LINT_ROOT)/out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
5050
$(HADOLINT_BIN):
5151
mkdir -p $(LINT_ROOT)/out/linters
@@ -59,7 +59,7 @@ hadolint-lint: $(HADOLINT_BIN)
5959
$(HADOLINT_BIN) $(shell find . -name "*Dockerfile")
6060

6161
GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
62-
GOLANGCI_LINT_VERSION ?= v2.5.0
62+
GOLANGCI_LINT_VERSION ?= v2.7.2
6363
GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
6464
$(GOLANGCI_LINT_BIN):
6565
mkdir -p $(LINT_ROOT)/out/linters
@@ -88,7 +88,7 @@ LINTERS += yamllint-lint
8888
yamllint-lint: $(YAMLLINT_BIN)
8989
PYTHONPATH=$(YAMLLINT_ROOT)/dist $(YAMLLINT_ROOT)/dist/bin/yamllint .
9090

91-
BIOME_VERSION ?= 2.2.6
91+
BIOME_VERSION ?= 2.3.8
9292
BIOME_BIN := $(LINT_ROOT)/out/linters/biome-$(BIOME_VERSION)-$(LINT_ARCH)
9393
BIOME_CONFIG := $(LINT_ROOT)/biome.json
9494

Makefile.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LINTERS :=
2121
FIXERS :=
2222

2323
{{ if .Shell -}}
24-
SHELLCHECK_VERSION ?= v0.10.0
24+
SHELLCHECK_VERSION ?= v0.11.0
2525
SHELLCHECK_BIN := $(LINT_ROOT)/out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
2626
$(SHELLCHECK_BIN):
2727
mkdir -p $(LINT_ROOT)/out/linters
@@ -44,7 +44,7 @@ shellcheck-fix: $(SHELLCHECK_BIN)
4444
{{ end -}}
4545

4646
{{ if .Dockerfile -}}
47-
HADOLINT_VERSION ?= v2.12.1-beta
47+
HADOLINT_VERSION ?= v2.14.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 ?= v2.5.0
64+
GOLANGCI_LINT_VERSION ?= v2.7.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
@@ -96,7 +96,7 @@ yamllint-lint: $(YAMLLINT_BIN)
9696
{{ end -}}
9797

9898
{{ if .Web -}}
99-
BIOME_VERSION ?= 2.2.6
99+
BIOME_VERSION ?= 2.3.8
100100
BIOME_BIN := $(LINT_ROOT)/out/linters/biome-$(BIOME_VERSION)-$(LINT_ARCH)
101101
BIOME_CONFIG := $(LINT_ROOT)/biome.json
102102

0 commit comments

Comments
 (0)