Skip to content

Commit 520d8b6

Browse files
authored
Merge pull request #9 from codeGROOVE-dev/newver
fix makefile template, lint issues
2 parents 872b09b + e8b6b84 commit 520d8b6

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ linters:
175175
arguments:
176176
- max-lit-count: "5"
177177
allow-strs: '"","\n"'
178-
allow-ints: "0,1,2,3,256,1024"
178+
allow-ints: "0,1,2,3,256,1024,0o600,0o700,0o755"
179179
allow-floats: "0.0,0.,1.0,1.,2.0,2."
180180
- name: cognitive-complexity
181181
arguments: [50]
@@ -189,6 +189,8 @@ linters:
189189
disabled: true
190190
- name: max-public-structs
191191
arguments: [10]
192+
- name: flag-parameter # fixes are difficult
193+
disabled: true
192194

193195
rowserrcheck:
194196
# database/sql is always checked.

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ endif
2020
LINTERS :=
2121
FIXERS :=
2222

23-
SHELLCHECK_VERSION ?= v0.8.0
23+
SHELLCHECK_VERSION ?= v0.10.0
2424
SHELLCHECK_BIN := $(LINT_ROOT)/out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
2525
$(SHELLCHECK_BIN):
2626
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.27.1
73+
YAMLLINT_VERSION ?= 1.37.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: 2 additions & 2 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.12.0
47+
HADOLINT_VERSION ?= v2.12.1-beta
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.3.0
64+
GOLANGCI_LINT_VERSION ?= v2.3.1
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

lint-install.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ func applicableLinters(root string) (map[Language]bool, error) {
7272
found[Shell] = true
7373
case strings.HasSuffix(path, ".yml"), strings.HasSuffix(path, ".yaml"):
7474
found[YAML] = true
75+
default:
7576
}
7677

7778
return nil

0 commit comments

Comments
 (0)