Skip to content

Commit ce9094e

Browse files
authored
Merge branch 'master' into vulncheck
2 parents aa36afd + 271a55d commit ce9094e

30 files changed

+2246
-3603
lines changed

.github/peril/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: git fetch --prune --unshallow
2424

2525
- name: Create release
26-
uses: goreleaser/goreleaser-action@v3
26+
uses: goreleaser/goreleaser-action@v4
2727
with:
2828
version: latest
2929
args: release --rm-dist

.golangci.reference.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,21 @@ linters-settings:
402402
# Default: false
403403
custom-order: true
404404

405+
ginkgolinter:
406+
# Suppress the wrong length assertion warning.
407+
# Default: false
408+
suppress-len-assertion: true
409+
410+
# Suppress the wrong nil assertion warning.
411+
# Default: false
412+
suppress-nil-assertion: true
413+
414+
# Suppress the wrong error assertion warning.
415+
# Default: false
416+
suppress-err-assertion: true
417+
405418
gocognit:
406-
# Minimal code complexity to report
419+
# Minimal code complexity to report.
407420
# Default: 30 (but we recommend 10-20)
408421
min-complexity: 10
409422

@@ -654,8 +667,8 @@ linters-settings:
654667
template-path: /path/to/my/template.tmpl
655668

656669
goimports:
657-
# Put imports beginning with prefix after 3rd-party packages.
658-
# It's a comma-separated list of prefixes.
670+
# A comma-separated list of prefixes, which, if set, checks import paths
671+
# with the given prefixes are grouped after 3rd-party packages.
659672
# Default: ""
660673
local-prefixes: github.com/org/project
661674

@@ -1671,7 +1684,7 @@ linters-settings:
16711684
http-status-code-whitelist: [ "200", "400", "404", "500" ]
16721685

16731686
tagliatelle:
1674-
# Check the struck tag name case.
1687+
# Check the struct tag name case.
16751688
case:
16761689
# Use the struct field name to check the name of the struct tag.
16771690
# Default: false
@@ -1931,15 +1944,15 @@ linters-settings:
19311944

19321945
# Causes an error when an If statement that checks an error variable doesn't
19331946
# cuddle with the assignment of that variable.
1934-
enforce-err-cuddling: false
1935-
1936-
# When enforce-err-cuddling is enabled this is a list of names
1947+
force-err-cuddling: false
1948+
1949+
# When force-err-cuddling is enabled this is a list of names
19371950
# used for error variables to check for in the conditional.
19381951
error-variable-names: [ "err" ]
19391952

19401953
# Causes an error if a short declaration (:=) cuddles with anything other than
19411954
# another short declaration.
1942-
# This logic overrides enforce-err-cuddling among others.
1955+
# This logic overrides force-err-cuddling among others.
19431956
force-short-decl-cuddling: false
19441957

19451958
# The custom section can be used to define linter plugins to be loaded at runtime.
@@ -1992,6 +2005,7 @@ linters:
19922005
- forcetypeassert
19932006
- funlen
19942007
- gci
2008+
- ginkgolinter
19952009
- gochecknoglobals
19962010
- gochecknoinits
19972011
- gocognit
@@ -2100,6 +2114,7 @@ linters:
21002114
- forcetypeassert
21012115
- funlen
21022116
- gci
2117+
- ginkgolinter
21032118
- gochecknoglobals
21042119
- gochecknoinits
21052120
- gocognit

.goreleaser.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ builds:
1313
- windows
1414
- linux
1515
- freebsd
16+
- netbsd
1617
goarch:
1718
- amd64
1819
- arm64

0 commit comments

Comments
 (0)