Skip to content

Commit 834ec9c

Browse files
committed
Merge remote-tracking branch 'source/master' into namedreturns
2 parents 1edb1ca + 7086a94 commit 834ec9c

File tree

15 files changed

+1392
-1463
lines changed

15 files changed

+1392
-1463
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ jobs:
3434
- name: Install Go
3535
uses: actions/setup-go@v2
3636
with:
37-
go-version: 1.17 # TODO(ldez) the binary compiled with go1.17 doesn't work on go1.18
3837
# stable: 'false' # Keep this line to be able to use rc and beta version of Go (ex: 1.18.0-rc1).
39-
# go-version: ${{ env.GO_VERSION }} # TODO(ldez) the binary compiled with go1.17 doesn't work on go1.18
38+
go-version: ${{ env.GO_VERSION }}
4039
- name: lint
4140
uses: golangci/golangci-lint-action@v3.1.0
4241
with:

.golangci.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,19 @@ linters-settings:
3333
goimports:
3434
local-prefixes: github.com/golangci/golangci-lint
3535
gomnd:
36-
# TODO(ldez) must be rewritten after the v1.44.0 release.
37-
settings:
38-
mnd:
39-
# don't include the "operation" and "assign"
40-
checks: argument,case,condition,return
41-
ignored-numbers: 0,1,2,3
42-
ignored-functions: strings.SplitN
36+
# don't include the "operation" and "assign"
37+
checks:
38+
- argument
39+
- case
40+
- condition
41+
- return
42+
ignored-numbers:
43+
- '0'
44+
- '1'
45+
- '2'
46+
- '3'
47+
ignored-functions:
48+
- strings.SplitN
4349

4450
govet:
4551
check-shadowing: true

0 commit comments

Comments
 (0)